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>
2013-03-27 20:16:05 +01:00
parent 629e05ea1b
commit c61210089f
21 changed files with 12 additions and 28 deletions
--- a/qbs/defaults.js
+++ b/qbs/defaults.js
@@ -6,6 +6,7 @@ function testsEnabled(qbs)
 function defines(qbs)
 {
    var list = [
+        "QT_CREATOR",
        'IDE_LIBRARY_BASENAME="lib"',
        "QT_DISABLE_DEPRECATED_BEFORE=0x040900",
        "QT_NO_CAST_TO_ASCII",
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -164,7 +164,7 @@ LIBS += -L$$IDE_LIBRARY_PATH
    DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
 }

-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION

 unix {
--- a/src/libs/glsl/glsl.pri
+++ b/src/libs/glsl/glsl.pri
@@ -1,2 +1 @@
 LIBS *= -l$$qtLibraryName(GLSL)
-DEFINES *= QT_CREATOR
--- a/src/libs/glsl/glsl.pro
+++ b/src/libs/glsl/glsl.pro
@@ -1,8 +1,7 @@
 TEMPLATE = lib
 TARGET = GLSL
 DEFINES += \
-    GLSL_BUILD_LIB \
-    QT_CREATOR
+    GLSL_BUILD_LIB

 include(../../qtcreatorlibrary.pri)
 include(glsl-lib.pri)
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -5,7 +5,6 @@ QtcLibrary {
    name: "GLSL"

    cpp.defines: base.concat([
-        "QT_CREATOR",
        "GLSL_BUILD_LIB"
    ])

--- a/src/libs/languageutils/languageutils.pri
+++ b/src/libs/languageutils/languageutils.pri
@@ -1,2 +1 @@
 LIBS *= -l$$qtLibraryName(LanguageUtils)
-DEFINES *= QT_CREATOR
--- a/src/libs/languageutils/languageutils.pro
+++ b/src/libs/languageutils/languageutils.pro
@@ -1,6 +1,5 @@
 TEMPLATE = lib
 TARGET = LanguageUtils
-DEFINES += QT_CREATOR

 unix:QMAKE_CXXFLAGS_DEBUG += -O3

--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -6,7 +6,6 @@ QtcLibrary {

    cpp.includePaths: base.concat("../3rdparty/cplusplus")
    cpp.defines: base.concat([
-        "QT_CREATOR",
        "LANGUAGEUTILS_BUILD_DIR"
    ])
    cpp.optimization: "fast"
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -7,8 +7,7 @@ QtcLibrary {
    cpp.includePaths: base.concat("easingpane")
    cpp.defines: base.concat([
        "QWEAKPOINTER_ENABLE_ARROW",
-        "BUILD_QMLEDITORWIDGETS_LIB",
-        "QT_CREATOR"
+        "BUILD_QMLEDITORWIDGETS_LIB"
    ])
    cpp.optimization: "fast"

--- a/src/libs/qmljs/qmljs.pri
+++ b/src/libs/qmljs/qmljs.pri
@@ -3,4 +3,3 @@ INCLUDEPATH *= $$PWD/../../shared/qmljs
 INCLUDEPATH *= $$PWD/../../shared/qmljs/parser

 LIBS *= -l$$qtLibraryName(QmlJS)
-DEFINES *= QT_CREATOR
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = QmlJS
-DEFINES += QMLJS_BUILD_DIR QT_CREATOR
+DEFINES += QMLJS_BUILD_DIR

 QT +=script
 include(../../qtcreatorlibrary.pri)
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -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"
-        ]
    }
 }

--- a/src/plugins/glsleditor/glsleditor.pro
+++ b/src/plugins/glsleditor/glsleditor.pro
@@ -3,8 +3,7 @@ TARGET = GLSLEditor
 include(../../qtcreatorplugin.pri)

 DEFINES += \
-    GLSLEDITOR_LIBRARY \
-    QT_CREATOR
+    GLSLEDITOR_LIBRARY

 HEADERS += \
 glsleditor.h \
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
    Depends { name: "CppTools" }
    Depends { name: "cpp" }

-    cpp.defines: base.concat(["PYEDITOR_LIBRARY", "QT_CREATOR"])
+    cpp.defines: base.concat(["PYEDITOR_LIBRARY"])

    files: [
        "pythoneditor.cpp",
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -14,7 +14,6 @@ macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../
 QBS_BUILD_DIR_FWD_SLASHES = $$replace(QBS_BUILD_DIR, \\\\, /)
 DEFINES += QBS_BUILD_DIR=\\\"$$QBS_BUILD_DIR_FWD_SLASHES\\\"
 DEFINES += \
-    QT_CREATOR \
    QBSPROJECTMANAGER_LIBRARY

 HEADERS = \
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -4,8 +4,7 @@ include(../../qtcreatorplugin.pri)
 QT += script

 DEFINES += \
-    QMLJSEDITOR_LIBRARY \
-    QT_CREATOR
+    QMLJSEDITOR_LIBRARY

 HEADERS += \
    qmljseditor.h \
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
    Depends { name: "CPlusPlus" }

    Depends { name: "cpp" }
-    cpp.defines: base.concat("QT_CREATOR")

    files: [
        "QmlJSEditor.mimetypes.xml",
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -4,7 +4,6 @@ QT += network
 include(../../qtcreatorplugin.pri)

 DEFINES += \
-    QT_CREATOR \
    QT4PROJECTMANAGER_LIBRARY

 HEADERS += \
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = QtSupport
-DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
+DEFINES += QTSUPPORT_LIBRARY
 QT += network declarative

 include(../../qtcreatorplugin.pri)
--- a/tests/auto/qml/persistenttrie/persistenttrie.pro
+++ b/tests/auto/qml/persistenttrie/persistenttrie.pro
@@ -16,7 +16,7 @@ SOURCES += \

 TEMPLATE = app
 TARGET = tester
-DEFINES += QMLJS_BUILD_DIR QT_CREATOR
+DEFINES += QMLJS_BUILD_DIR

 OTHER_FILES += \
    listAll.data \
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -25,7 +25,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {

 # DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
 DEFINES+=QTCREATORDIR=\\\"$$IDE_BUILD_TREE\\\"
-DEFINES+=QT_CREATOR QTCREATOR_TEST QMLDESIGNER_TEST
+DEFINES += QTCREATOR_TEST QMLDESIGNER_TEST

 INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore