mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 16:18:42 +00:00
QT5 -- Fixups for Mac build
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:
17
qwt/qwt.pro
17
qwt/qwt.pro
@@ -12,22 +12,7 @@ include( qwtconfig.pri )
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
|
||||
SUBDIRS = \
|
||||
src \
|
||||
textengines \
|
||||
doc
|
||||
|
||||
contains(QWT_CONFIG, QwtDesigner ) {
|
||||
SUBDIRS += designer
|
||||
}
|
||||
|
||||
contains(QWT_CONFIG, QwtExamples ) {
|
||||
SUBDIRS += examples
|
||||
}
|
||||
|
||||
contains(QWT_CONFIG, QwtPlayground ) {
|
||||
SUBDIRS += playground
|
||||
}
|
||||
SUBDIRS = src
|
||||
|
||||
qwtspec.files = qwtconfig.pri qwtfunctions.pri qwt.prf
|
||||
qwtspec.path = $${QWT_INSTALL_FEATURES}
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
CONFIG += qt
|
||||
CONFIG += warn_on
|
||||
CONFIG += no_keywords
|
||||
CONFIG += silent
|
||||
#CONFIG += silent
|
||||
CONFIG += static
|
||||
|
||||
######################################################################
|
||||
# release/debug mode
|
||||
@@ -32,7 +33,7 @@ win32 {
|
||||
}
|
||||
else {
|
||||
|
||||
CONFIG += debug
|
||||
CONFIG += release
|
||||
|
||||
VER_MAJ = $${QWT_VER_MAJ}
|
||||
VER_MIN = $${QWT_VER_MIN}
|
||||
|
||||
@@ -9,7 +9,7 @@ TARGET = GoldenCheetah
|
||||
DEPENDPATH += .
|
||||
|
||||
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 {
|
||||
QT += macextras
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user