From 50649339443f6e887799fbacfe7ba71f2eb3dac4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 21 Aug 2012 11:37:49 +0200 Subject: [PATCH] Avoid adding the same DEFINE multiple times to the command line E.g. on MSVC, QT_CREATOR was passed 14 times ... Change-Id: Ife39267b0d6f2def1706b823abfd0226325437ae Reviewed-by: Eike Ziller --- src/libs/cplusplus/cplusplus.pri | 5 +++-- src/libs/glsl/glsl.pri | 2 +- src/libs/languageutils/languageutils.pri | 2 +- src/libs/qmleditorwidgets/qmleditorwidgets.pri | 3 ++- src/libs/qmljs/qmljs.pri | 9 ++++----- src/plugins/analyzerbase/analyzerbase.pri | 2 +- src/plugins/debugger/debugger.pri | 2 +- src/plugins/qmljstools/qmljstools.pri | 2 +- src/plugins/qtsupport/qtsupport.pri | 7 ++++--- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri index d43b4fc1c9c..702e15eb647 100644 --- a/src/libs/cplusplus/cplusplus.pri +++ b/src/libs/cplusplus/cplusplus.pri @@ -1,3 +1,4 @@ -INCLUDEPATH +=$$IDE_SOURCE_TREE/src/libs/3rdparty $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus -INCLUDEPATH += $$PWD +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus +INCLUDEPATH *= $$PWD LIBS *= -l$$qtLibraryName(CPlusPlus) diff --git a/src/libs/glsl/glsl.pri b/src/libs/glsl/glsl.pri index 693082c2b18..6ac58e127af 100644 --- a/src/libs/glsl/glsl.pri +++ b/src/libs/glsl/glsl.pri @@ -1,2 +1,2 @@ LIBS *= -l$$qtLibraryName(GLSL) -DEFINES += QT_CREATOR +DEFINES *= QT_CREATOR diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri index 0ed4f1e1f6a..776658faf16 100644 --- a/src/libs/languageutils/languageutils.pri +++ b/src/libs/languageutils/languageutils.pri @@ -1,2 +1,2 @@ LIBS *= -l$$qtLibraryName(LanguageUtils) -DEFINES += QT_CREATOR +DEFINES *= QT_CREATOR diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri index 4a2788cf3a8..fcd2f9b3dbb 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri @@ -1,4 +1,5 @@ -INCLUDEPATH += $$PWD $$PWD/easingpane +INCLUDEPATH *= $$PWD +INCLUDEPATH *= $$PWD/easingpane greaterThan(QT_MAJOR_VERSION, 4) { QT += quick1 } else { diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri index 20d20c513da..948dcce450e 100644 --- a/src/libs/qmljs/qmljs.pri +++ b/src/libs/qmljs/qmljs.pri @@ -1,7 +1,6 @@ -INCLUDEPATH += \ - $$PWD/../../shared \ - $$PWD/../../shared/qmljs \ - $$PWD/../../shared/qmljs/parser +INCLUDEPATH *= $$PWD/../../shared +INCLUDEPATH *= $$PWD/../../shared/qmljs +INCLUDEPATH *= $$PWD/../../shared/qmljs/parser LIBS *= -l$$qtLibraryName(QmlJS) -DEFINES += QT_CREATOR +DEFINES *= QT_CREATOR diff --git a/src/plugins/analyzerbase/analyzerbase.pri b/src/plugins/analyzerbase/analyzerbase.pri index 82780bd242a..b763226fe3c 100644 --- a/src/plugins/analyzerbase/analyzerbase.pri +++ b/src/plugins/analyzerbase/analyzerbase.pri @@ -1,4 +1,4 @@ include(analyzerbase_dependencies.pri) -INCLUDEPATH += $$PWD +INCLUDEPATH *= $$PWD LIBS *= -l$$qtLibraryName(AnalyzerBase) diff --git a/src/plugins/debugger/debugger.pri b/src/plugins/debugger/debugger.pri index 357158b002c..d2d0e11f552 100644 --- a/src/plugins/debugger/debugger.pri +++ b/src/plugins/debugger/debugger.pri @@ -1,4 +1,4 @@ include(debugger_dependencies.pri) -INCLUDEPATH += $$PWD +INCLUDEPATH *= $$PWD LIBS *= -l$$qtLibraryName(Debugger) diff --git a/src/plugins/qmljstools/qmljstools.pri b/src/plugins/qmljstools/qmljstools.pri index 5b1a7b957cc..75415d0c1f9 100644 --- a/src/plugins/qmljstools/qmljstools.pri +++ b/src/plugins/qmljstools/qmljstools.pri @@ -1,5 +1,5 @@ include(qmljstools_dependencies.pri) -INCLUDEPATH += $$PWD/.. +INCLUDEPATH *= $$PWD/.. LIBS *= -l$$qtLibraryName(QmlJSTools) diff --git a/src/plugins/qtsupport/qtsupport.pri b/src/plugins/qtsupport/qtsupport.pri index 06e0f025e80..a419733faf9 100644 --- a/src/plugins/qtsupport/qtsupport.pri +++ b/src/plugins/qtsupport/qtsupport.pri @@ -1,6 +1,7 @@ include(qtsupport_dependencies.pri) LIBS *= -l$$qtLibraryName(QtSupport) -DEFINES += \ - QMAKE_AS_LIBRARY \ - PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE PROEVALUATOR_CUMULATIVE +DEFINES *= QMAKE_AS_LIBRARY +DEFINES *= PROPARSER_THREAD_SAFE +DEFINES *= PROEVALUATOR_THREAD_SAFE +DEFINES *= PROEVALUATOR_CUMULATIVE