diff --git a/qbs/defaults.js b/qbs/defaults.js
index b486888e902c5044ef3509d71d4f8db996297876..12d89c9fa24849acc0c52d82977bc13c0da481ec 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 f8212e611dc375d367832bc956faafed250e8368..a384e36a50719743d12bc5d34aa8b9496db95c57 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 6ac58e127af3356314a72e0c05b89089f557949b..b6de9eab22f00426c5831eb8509712c896dd8aea 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 e64f40bba8ba1fc2ae423589d45170f54f9c00ba..3678588a4717c1dc76c1e667f0c3825b15fb54e0 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 fc5c0ab7f5439bde6afd8ae7675cfdaeef191b77..5418b7d82b57878db6984bdf5326795ca660b43d 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 776658faf16e5222bb5dea106f72134ccecda6ae..9709183d8534fa8544a64432ac7aff6ba84f4eeb 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 8cc7fff372c2fa9baa5c239dfeb41bfaff95ead8..b1d7649aaa768d7ef67e3d94491e5b012f981519 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 811c4a960903f04fdb9b2b6c6ca46de638919125..51926067c2d3609e32a30f407b3281237af6de91 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 19099b415698822a3592530701dc4d69ba485367..e943f32c1cad2e2a300ea10507b078f1b965e708 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 948dcce450e1bc9117c04f8aa48c59e20b7149bd..132a3d81e253c534a975aefa91613781b2278777 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 0b9c5be65d9e5f91bf8143c4e860b1fe66aa6e27..a5d788151c44fd841957cc329147f01b52ccd649 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 ec66195d53834dfcaa78f9b1fae372945383d9b9..bf0efb0611ca306069f0e42e028efb59a9464eb1 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 9a31f92b62d20c3890d76249252bba4ba3dcfc08..98c241d57ce13fabd8c5364d5a9c505021bf0808 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 3c815d6983b72874c806c748e0f2f2b0427c700d..e77e4f8eb14e3acb424ad5e8a508e677ea98074d 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 b47576c4307349b16e99be6e3871b644d175cf1f..845e33de7329b712bc264191f750f67bc89d394e 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 c5be9220a59cfc9f2f7433c4789e7e8df3fb5615..48631aa79f74dd972d27388ba6505b7b9101b4f5 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 11d06ce5d7349d6fec7977a31c51747b3e29548f..132202cae2231f7c83c744d232fb7e0c7be480aa 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 7733fd0dbf1086e23ce8260a0ca481049f183190..4f4188aa18c19501ee25edc80e6ab9755e85a5d6 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 4ca5ea206a25ee5576abdc786d73e49fcc15725f..3c9e29d59bbc82b96017e67e7af3709472b25a2d 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 03f039fcb718ed441b8fdc85e4bbddddb2fcc472..d4273773c5038dede2dcf9bafdd540bd0fcb35be 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 8924538412f7e76caecce0b1557d8955ad8ab38f..ca31ee4439efe6020bab202ce80bf79aa702495d 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