From c61210089fa3da9e4b40a2dbcb33e0ed814edd89 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 27 Mar 2013 20:16:05 +0100
Subject: [PATCH] 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>
---
qbs/defaults.js | 1 +
qtcreator.pri | 2 +-
src/libs/glsl/glsl.pri | 1 -
src/libs/glsl/glsl.pro | 3 +--
src/libs/glsl/glsl.qbs | 1 -
src/libs/languageutils/languageutils.pri | 1 -
src/libs/languageutils/languageutils.pro | 1 -
src/libs/languageutils/languageutils.qbs | 1 -
src/libs/qmleditorwidgets/qmleditorwidgets.qbs | 3 +--
src/libs/qmljs/qmljs.pri | 1 -
src/libs/qmljs/qmljs.pro | 2 +-
src/libs/qmljs/qmljs.qbs | 6 +-----
src/plugins/glsleditor/glsleditor.pro | 3 +--
src/plugins/pythoneditor/pythoneditor.qbs | 2 +-
src/plugins/qbsprojectmanager/qbsprojectmanager.pro | 1 -
src/plugins/qmljseditor/qmljseditor.pro | 3 +--
src/plugins/qmljseditor/qmljseditor.qbs | 1 -
src/plugins/qt4projectmanager/qt4projectmanager.pro | 1 -
src/plugins/qtsupport/qtsupport.pro | 2 +-
tests/auto/qml/persistenttrie/persistenttrie.pro | 2 +-
tests/auto/qml/qmldesigner/coretests/coretests.pro | 2 +-
21 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/qbs/defaults.js b/qbs/defaults.js
index b486888e902..12d89c9fa24 100644
--- 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",
diff --git a/qtcreator.pri b/qtcreator.pri
index f8212e611dc..a384e36a507 100644
--- 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 {
diff --git a/src/libs/glsl/glsl.pri b/src/libs/glsl/glsl.pri
index 6ac58e127af..b6de9eab22f 100644
--- a/src/libs/glsl/glsl.pri
+++ b/src/libs/glsl/glsl.pri
@@ -1,2 +1 @@
LIBS *= -l$$qtLibraryName(GLSL)
-DEFINES *= QT_CREATOR
diff --git a/src/libs/glsl/glsl.pro b/src/libs/glsl/glsl.pro
index e64f40bba8b..3678588a471 100644
--- 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)
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index fc5c0ab7f54..5418b7d82b5 100644
--- 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"
])
diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri
index 776658faf16..9709183d853 100644
--- a/src/libs/languageutils/languageutils.pri
+++ b/src/libs/languageutils/languageutils.pri
@@ -1,2 +1 @@
LIBS *= -l$$qtLibraryName(LanguageUtils)
-DEFINES *= QT_CREATOR
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
index 8cc7fff372c..b1d7649aaa7 100644
--- 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
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 811c4a96090..51926067c2d 100644
--- 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"
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 19099b41569..e943f32c1ca 100644
--- 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"
diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri
index 948dcce450e..132a3d81e25 100644
--- 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
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index 0b9c5be65d9..a5d788151c4 100644
--- 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)
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index ec66195d538..bf0efb0611c 100644
--- 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"
- ]
}
}
diff --git a/src/plugins/glsleditor/glsleditor.pro b/src/plugins/glsleditor/glsleditor.pro
index 9a31f92b62d..98c241d57ce 100644
--- 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 \
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index 3c815d6983b..e77e4f8eb14 100644
--- 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",
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index b47576c4307..845e33de732 100644
--- 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 = \
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index c5be9220a59..48631aa79f7 100644
--- 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 \
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 11d06ce5d73..132202cae22 100644
--- 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",
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 7733fd0dbf1..4f4188aa18c 100644
--- 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 += \
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 4ca5ea206a2..3c9e29d59bb 100644
--- 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)
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.pro b/tests/auto/qml/persistenttrie/persistenttrie.pro
index 03f039fcb71..d4273773c50 100644
--- 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 \
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 8924538412f..ca31ee4439e 100644
--- 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
--
GitLab