forked from qt-creator/qt-creator
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 <eike.ziller@nokia.com>
This commit is contained in:
@@ -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)
|
||||
|
@@ -1,2 +1,2 @@
|
||||
LIBS *= -l$$qtLibraryName(GLSL)
|
||||
DEFINES += QT_CREATOR
|
||||
DEFINES *= QT_CREATOR
|
||||
|
@@ -1,2 +1,2 @@
|
||||
LIBS *= -l$$qtLibraryName(LanguageUtils)
|
||||
DEFINES += QT_CREATOR
|
||||
DEFINES *= QT_CREATOR
|
||||
|
@@ -1,4 +1,5 @@
|
||||
INCLUDEPATH += $$PWD $$PWD/easingpane
|
||||
INCLUDEPATH *= $$PWD
|
||||
INCLUDEPATH *= $$PWD/easingpane
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
QT += quick1
|
||||
} else {
|
||||
|
@@ -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
|
||||
|
@@ -1,4 +1,4 @@
|
||||
include(analyzerbase_dependencies.pri)
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH *= $$PWD
|
||||
LIBS *= -l$$qtLibraryName(AnalyzerBase)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
include(debugger_dependencies.pri)
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH *= $$PWD
|
||||
LIBS *= -l$$qtLibraryName(Debugger)
|
||||
|
@@ -1,5 +1,5 @@
|
||||
include(qmljstools_dependencies.pri)
|
||||
|
||||
INCLUDEPATH += $$PWD/..
|
||||
INCLUDEPATH *= $$PWD/..
|
||||
|
||||
LIBS *= -l$$qtLibraryName(QmlJSTools)
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user