define QT_CREATOR centrally

numerous "3rdparty" libraries have respective #ifdefs, and consequently
the define is added in several places. it's quite a mess with the .pr?
and .qbs files, though. solve the problem by sidestepping it.

Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-03-27 20:16:05 +01:00
parent 629e05ea1b
commit c61210089f
21 changed files with 12 additions and 28 deletions

View File

@@ -3,4 +3,3 @@ INCLUDEPATH *= $$PWD/../../shared/qmljs
INCLUDEPATH *= $$PWD/../../shared/qmljs/parser
LIBS *= -l$$qtLibraryName(QmlJS)
DEFINES *= QT_CREATOR

View File

@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = QmlJS
DEFINES += QMLJS_BUILD_DIR QT_CREATOR
DEFINES += QMLJS_BUILD_DIR
QT +=script
include(../../qtcreatorlibrary.pri)

View File

@@ -6,8 +6,7 @@ QtcLibrary {
cpp.includePaths: base.concat("parser")
cpp.defines: base.concat([
"QMLJS_BUILD_DIR",
"QT_CREATOR"
"QMLJS_BUILD_DIR"
])
cpp.optimization: "fast"
@@ -110,9 +109,6 @@ QtcLibrary {
ProductModule {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" }
cpp.defines: [
"QT_CREATOR"
]
}
}