Fix qbs build for Qt 5.

Make sure newly deprecated stuff is still available.

Change-Id: I9ebdfcd9a5ecee125a3c73f5f3254ae319d8b282
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

18 files changed, 25 insertions, 26 deletions

diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index 5cd779488a..ee8afc1d03 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -44,7 +44,7 @@ QtcLibrary {
                 "BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK", "BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE",
                 "BOTAN_HAS_DYNAMIC_LOADER", "BOTAN_HAS_ENTROPY_SRC_CAPI",
                 "BOTAN_HAS_ENTROPY_SRC_WIN32", "BOTAN_HAS_MUTEX_WIN32")
-        return result
+        return base.concat(result)
     }
 
     Properties {
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index efacb4adf1..1145ddd40e 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -2,6 +2,7 @@ import qbs.base 1.0
 
 DynamicLibrary {
     Depends { name: "cpp" }
+    cpp.defines: project.additionalCppDefines
     cpp.linkerFlags: {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
             return ["-Wl,-s"]
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index ac34d281db..9edc3f45f9 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -8,9 +8,6 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
-        "AGGREGATION_LIBRARY"
-    ]
 
     Depends { name: "cpp" }
     Depends { name: "Qt.core" }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 31b17d3d64..6038fc6a2c 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -10,10 +10,10 @@ QtcLibrary {
         "../3rdparty/cplusplus",
         "../../plugins"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "NDEBUG",
         "CPLUSPLUS_BUILD_LIB"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 3c36c327bb..bbdd8b74b3 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -8,10 +8,10 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "EXTENSIONSYSTEM_LIBRARY",
         "IDE_TEST_DIR=\".\""
-    ]
+    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["core", "widgets"] }
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index 506b709c25..7ee3557673 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -8,10 +8,10 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QT_CREATOR",
         "GLSL_BUILD_LIB"
-    ]
+    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt.gui" }
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 4ac659b630..abd23f95c8 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -9,10 +9,10 @@ QtcLibrary {
         "..",
         "../3rdparty/cplusplus"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QT_CREATOR",
         "LANGUAGEUTILS_BUILD_DIR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index 45fb5ecfa9..c9fa8c01a4 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -8,9 +8,9 @@ QtcLibrary {
         ".",
         ".."
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QMLDEBUG_LIB"
-    ]
+    ])
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["gui", "network"] }
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index e0b057e759..7310ed8d03 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -9,11 +9,11 @@ QtcLibrary {
         "..",
         "easingpane"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QWEAKPOINTER_ENABLE_ARROW",
         "BUILD_QMLEDITORWIDGETS_LIB",
         "QT_CREATOR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 68e2e5666b..d7b556b06b 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -9,10 +9,10 @@ QtcLibrary {
         "..",
         "parser"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "QMLJS_BUILD_DIR",
         "QT_CREATOR"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "Utils" }
diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs
index 1ab8d83e5c..e4e8d45e36 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/src/libs/qtcomponents/styleitem/styleitem.qbs
@@ -7,6 +7,8 @@ DynamicLibrary {
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
 
+    cpp.defines: project.additionalCppDefines
+
     files: [
         "qdeclarativefolderlistmodel.cpp",
         "qdeclarativefolderlistmodel.h",
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index cb8603327c..755bb221b3 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "QtcSsh"
 
-    cpp.defines: ["QSSH_LIBRARY"]
+    cpp.defines: base.concat(["QSSH_LIBRARY"])
     cpp.includePaths: [
         ".",
         "..",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 10e8d28422..4f0ed57b97 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "Utils"
 
-    cpp.defines: ["QTCREATOR_UTILS_LIB"]
+    cpp.defines: base.concat(["QTCREATOR_UTILS_LIB"])
     cpp.includePaths: [
         ".",
         "..",
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index a3e3d931a5..3da7b7a61b 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -8,14 +8,13 @@ QtcLibrary {
     Depends { name: "Qt.network" }
 
     cpp.includePaths: "."
-    cpp.defines: ["ZEROCONF_LIBRARY"]
     Properties {
         condition: qbs.targetOS == "windows"
         cpp.dynamicLibraries:  "ws2_32"
     }
     Properties {
         condition: qbs.targetOS == "linux"
-        cpp.defines: outer.concat([
+        cpp.defines: base.concat([
             "_GNU_SOURCE",
             "HAVE_IPV6",
             "USES_NETLINK",
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 83b33f78d1..606e798000 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -21,7 +21,7 @@ Product {
 
     Depends { name: "pluginspec" }
     Depends { name: "cpp" }
-    cpp.defines: [name.toUpperCase() + "_LIBRARY"]
+    cpp.defines: project.additionalCppDefines.concat([name.toUpperCase() + "_LIBRARY"])
     cpp.rpaths: ["$ORIGIN/../../.."]
     cpp.linkerFlags: {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 548fad250f..7fada29a11 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -13,10 +13,10 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.defines: [
+    cpp.defines: base.concat([
         "ANALYZER_LIBRARY",
         "QT_NO_CAST_FROM_ASCII"
-    ]
+    ])
     cpp.includePaths: [
         "..",
         "../../libs",
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 7bb7c6648c..eede402cfc 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
     Depends { name: "QtcSsh" }
 
     Depends { name: "cpp" }
-    cpp.defines: ["DEBUGGER_LIBRARY"]
     cpp.includePaths: [
         ".",
         "shared",
diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs
index 9632ecc098..7669496dca 100644
--- a/src/tools/QtcTool.qbs
+++ b/src/tools/QtcTool.qbs
@@ -2,6 +2,7 @@ import qbs.base 1.0
 
 Application {
     Depends { name: "cpp" }
+    cpp.defines: project.additionalCppDefines
     cpp.linkerFlags: {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
             return ["-Wl,-s"]