feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid adding the same DEFINE multiple times to the command line

Browse Source 
E.g. on MSVC, QT_CREATOR was passed 14 times ...

Change-Id: Ife39267b0d6f2def1706b823abfd0226325437ae
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Kai Koehne
2012-08-21 11:37:49 +02:00
committed by Eike Ziller
parent 655962a2c3
commit 5064933944
9 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/cplusplus/cplusplus.pri
View File

@@ -1,3 +1,4 @@
INCLUDEPATH +=$$IDE_SOURCE_TREE/src/libs/3rdparty $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty
INCLUDEPATH += $$PWD INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
INCLUDEPATH *= $$PWD
LIBS *= -l$$qtLibraryName(CPlusPlus) LIBS *= -l$$qtLibraryName(CPlusPlus)

2
src/libs/glsl/glsl.pri
View File

@@ -1,2 +1,2 @@
LIBS *= -l$$qtLibraryName(GLSL) LIBS *= -l$$qtLibraryName(GLSL)
DEFINES += QT_CREATOR DEFINES *= QT_CREATOR

2
src/libs/languageutils/languageutils.pri
View File

@@ -1,2 +1,2 @@
LIBS *= -l$$qtLibraryName(LanguageUtils) LIBS *= -l$$qtLibraryName(LanguageUtils)
DEFINES += QT_CREATOR DEFINES *= QT_CREATOR

3
src/libs/qmleditorwidgets/qmleditorwidgets.pri
View File

@@ -1,4 +1,5 @@
INCLUDEPATH += $$PWD $$PWD/easingpane INCLUDEPATH *= $$PWD
INCLUDEPATH *= $$PWD/easingpane
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1 QT += quick1
} else { } else {

9
src/libs/qmljs/qmljs.pri
View File

@@ -1,7 +1,6 @@
INCLUDEPATH += \ INCLUDEPATH *= $$PWD/../../shared
$$PWD/../../shared \ INCLUDEPATH *= $$PWD/../../shared/qmljs
$$PWD/../../shared/qmljs \ INCLUDEPATH *= $$PWD/../../shared/qmljs/parser
$$PWD/../../shared/qmljs/parser
LIBS *= -l$$qtLibraryName(QmlJS) LIBS *= -l$$qtLibraryName(QmlJS)
DEFINES += QT_CREATOR DEFINES *= QT_CREATOR

2
src/plugins/analyzerbase/analyzerbase.pri
View File

@@ -1,4 +1,4 @@
include(analyzerbase_dependencies.pri) include(analyzerbase_dependencies.pri)
INCLUDEPATH += $$PWD INCLUDEPATH *= $$PWD
LIBS *= -l$$qtLibraryName(AnalyzerBase) LIBS *= -l$$qtLibraryName(AnalyzerBase)

2
src/plugins/debugger/debugger.pri
View File

@@ -1,4 +1,4 @@
include(debugger_dependencies.pri) include(debugger_dependencies.pri)
INCLUDEPATH += $$PWD INCLUDEPATH *= $$PWD
LIBS *= -l$$qtLibraryName(Debugger) LIBS *= -l$$qtLibraryName(Debugger)

2
src/plugins/qmljstools/qmljstools.pri
View File

@@ -1,5 +1,5 @@
include(qmljstools_dependencies.pri) include(qmljstools_dependencies.pri)
INCLUDEPATH += $$PWD/.. INCLUDEPATH *= $$PWD/..
LIBS *= -l$$qtLibraryName(QmlJSTools) LIBS *= -l$$qtLibraryName(QmlJSTools)

7
src/plugins/qtsupport/qtsupport.pri
View File

@@ -1,6 +1,7 @@
include(qtsupport_dependencies.pri) include(qtsupport_dependencies.pri)
LIBS *= -l$$qtLibraryName(QtSupport) LIBS *= -l$$qtLibraryName(QtSupport)
DEFINES += \ DEFINES *= QMAKE_AS_LIBRARY
QMAKE_AS_LIBRARY \ DEFINES *= PROPARSER_THREAD_SAFE
PROPARSER_THREAD_SAFE PROEVALUATOR_THREAD_SAFE PROEVALUATOR_CUMULATIVE DEFINES *= PROEVALUATOR_THREAD_SAFE
DEFINES *= PROEVALUATOR_CUMULATIVE