From 6d17da175f66a24143f676fc5b51a5b69b2b5cf4 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 17 Sep 2012 15:32:02 +0200
Subject: [PATCH] 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>
---
qtcreator.qbp | 5 ++++-
src/libs/3rdparty/botan/botan.qbs | 2 +-
src/libs/QtcLibrary.qbs | 1 +
src/libs/aggregation/aggregation.qbs | 3 ---
src/libs/cplusplus/cplusplus.qbs | 4 ++--
src/libs/extensionsystem/extensionsystem.qbs | 4 ++--
src/libs/glsl/glsl.qbs | 4 ++--
src/libs/languageutils/languageutils.qbs | 4 ++--
src/libs/qmldebug/qmldebug.qbs | 4 ++--
src/libs/qmleditorwidgets/qmleditorwidgets.qbs | 4 ++--
src/libs/qmljs/qmljs.qbs | 4 ++--
src/libs/qtcomponents/styleitem/styleitem.qbs | 2 ++
src/libs/ssh/ssh.qbs | 2 +-
src/libs/utils/utils.qbs | 2 +-
src/libs/zeroconf/zeroconf.qbs | 3 +--
src/plugins/QtcPlugin.qbs | 2 +-
src/plugins/analyzerbase/analyzerbase.qbs | 4 ++--
src/plugins/debugger/debugger.qbs | 1 -
src/tools/QtcTool.qbs | 1 +
19 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/qtcreator.qbp b/qtcreator.qbp
index a8c0c2e8627..6fa81f2a343 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -6,7 +6,10 @@ Project {
property string ide_version_minor: '5'
property string ide_version_release: '83'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
- property var additionalCppDefines: [ 'IDE_LIBRARY_BASENAME="lib"' ]
+ property var additionalCppDefines: [
+ 'IDE_LIBRARY_BASENAME="lib"',
+ "QT_DISABLE_DEPRECATED_BEFORE=0x040900"
+ ]
moduleSearchPaths: "qbs"
references: [
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index 5cd779488aa..ee8afc1d033 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 efacb4adf12..1145ddd40e5 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 ac34d281dbe..9edc3f45f95 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 31b17d3d64f..6038fc6a2c4 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 3c36c327bb4..bbdd8b74b31 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 506b709c252..7ee3557673d 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 4ac659b6304..abd23f95c86 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 45fb5ecfa9a..c9fa8c01a4d 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 e0b057e759d..7310ed8d037 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 68e2e5666be..d7b556b06bd 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 1ab8d83e5cd..e4e8d45e365 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 cb8603327c3..755bb221b39 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 10e8d284225..4f0ed57b975 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 a3e3d931a54..3da7b7a61b2 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 83b33f78d1c..606e798000d 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 548fad250f2..7fada29a11e 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 7bb7c6648cf..eede402cfcb 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 9632ecc0982..7669496dca4 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"]
--
GitLab