nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

QT5 -- Fixups for Mac build

Browse Source 
Remember to make distclean too.

Mac currently looks terrible -- the unified toolbar
is gone and its all a bit of a mess!
This commit is contained in:
Mark Liversedge
2013-12-09 23:00:21 +00:00
parent a876c8da62
commit cbb5889113
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qwt/qwt.pro
View File

@@ -12,22 +12,7 @@ include( qwtconfig.pri )
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = \ SUBDIRS = src
src \
textengines \
doc
contains(QWT_CONFIG, QwtDesigner ) {
SUBDIRS += designer
}
contains(QWT_CONFIG, QwtExamples ) {
SUBDIRS += examples
}
contains(QWT_CONFIG, QwtPlayground ) {
SUBDIRS += playground
}
qwtspec.files = qwtconfig.pri qwtfunctions.pri qwt.prf qwtspec.files = qwtconfig.pri qwtfunctions.pri qwt.prf
qwtspec.path = $${QWT_INSTALL_FEATURES} qwtspec.path = $${QWT_INSTALL_FEATURES}

5
qwt/qwtbuild.pri
View File

@@ -14,7 +14,8 @@
CONFIG += qt CONFIG += qt
CONFIG += warn_on CONFIG += warn_on
CONFIG += no_keywords CONFIG += no_keywords
CONFIG += silent #CONFIG += silent
CONFIG += static
###################################################################### ######################################################################
# release/debug mode # release/debug mode
@@ -32,7 +33,7 @@ win32 {
} }
else { else {
CONFIG += debug CONFIG += release
VER_MAJ = $${QWT_VER_MAJ} VER_MAJ = $${QWT_VER_MAJ}
VER_MIN = $${QWT_VER_MIN} VER_MIN = $${QWT_VER_MIN}

2
src/src.pro
View File

@@ -9,7 +9,7 @@ TARGET = GoldenCheetah
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += ../qwt/src ../qxt/src $${LIBZ_INCLUDE} INCLUDEPATH += ../qwt/src ../qxt/src $${LIBZ_INCLUDE}
QT += xml sql network webkitwidgets script svg widgets QT += core xml sql network webkitwidgets script svg widgets
macx { macx {
QT += macextras QT += macextras
} }