Commit 6d17da17 authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann

Fix qbs build for Qt 5.

Make sure newly deprecated stuff is still available.

Change-Id: I9ebdfcd9a5ecee125a3c73f5f3254ae319d8b282
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent b0270f1f
......@@ -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: [
......
......@@ -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 {
......
......@@ -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"]
......
......@@ -8,9 +8,6 @@ QtcLibrary {
".",
".."
]
cpp.defines: [
"AGGREGATION_LIBRARY"
]
Depends { name: "cpp" }
Depends { name: "Qt.core" }
......
......@@ -10,10 +10,10 @@ QtcLibrary {
"../3rdparty/cplusplus",
"../../plugins"
]
cpp.defines: [
cpp.defines: base.concat([
"NDEBUG",
"CPLUSPLUS_BUILD_LIB"
]
])
cpp.optimization: "fast"
Depends { name: "cpp" }
......
......@@ -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"] }
......
......@@ -8,10 +8,10 @@ QtcLibrary {
".",
".."
]
cpp.defines: [
cpp.defines: base.concat([
"QT_CREATOR",
"GLSL_BUILD_LIB"
]
])
Depends { name: "cpp" }
Depends { name: "Qt.gui" }
......
......@@ -9,10 +9,10 @@ QtcLibrary {
"..",
"../3rdparty/cplusplus"
]
cpp.defines: [
cpp.defines: base.concat([
"QT_CREATOR",
"LANGUAGEUTILS_BUILD_DIR"
]
])
cpp.optimization: "fast"
Depends { name: "cpp" }
......
......@@ -8,9 +8,9 @@ QtcLibrary {
".",
".."
]
cpp.defines: [
cpp.defines: base.concat([
"QMLDEBUG_LIB"
]
])
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] }
......
......@@ -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" }
......
......@@ -9,10 +9,10 @@ QtcLibrary {
"..",
"parser"
]
cpp.defines: [
cpp.defines: base.concat([
"QMLJS_BUILD_DIR",
"QT_CREATOR"
]
])
cpp.optimization: "fast"
Depends { name: "Utils" }
......
......@@ -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",
......
......@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QtcSsh"
cpp.defines: ["QSSH_LIBRARY"]
cpp.defines: base.concat(["QSSH_LIBRARY"])
cpp.includePaths: [
".",
"..",
......
......@@ -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: [
".",
"..",
......
......@@ -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",
......
......@@ -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"))
......
......@@ -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",
......
......@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QtcSsh" }
Depends { name: "cpp" }
cpp.defines: ["DEBUGGER_LIBRARY"]
cpp.includePaths: [
".",
"shared",
......
......@@ -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"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment