diff --git a/qwt/qwt.pro b/qwt/qwt.pro index 04b7443a7..46ea6a804 100644 --- a/qwt/qwt.pro +++ b/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} diff --git a/qwt/qwtbuild.pri b/qwt/qwtbuild.pri index a0b865d22..b224301d3 100644 --- a/qwt/qwtbuild.pri +++ b/qwt/qwtbuild.pri @@ -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} diff --git a/src/src.pro b/src/src.pro index d6b1be022..d3b27629b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -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 }