From 0834958063edf149b7a25326b342100272daff3c Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Wed, 18 Apr 2012 17:02:20 +0200
Subject: [PATCH] qbs files updated
Property bindings in ProductModules now need explicit Depends items.
Also, some Qt dependencies were propagated wrongly and are now
added explicitely.
Change-Id: I58cd389eb0ab106004b1d575438d1ad2ff36189f
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
---
src/libs/3rdparty/botan/botan.qbs | 1 +
src/libs/cplusplus/cplusplus.qbs | 1 +
src/libs/glsl/glsl.qbs | 1 +
src/libs/qmleditorwidgets/qmleditorwidgets.qbs | 1 +
src/libs/qmljs/qmljs.qbs | 1 +
src/libs/qmljsdebugclient/qmljsdebugclient.qbs | 1 +
src/libs/symbianutils/symbianutils.qbs | 1 +
src/libs/utils/utils.qbs | 4 ++++
src/libs/zeroconf/zeroconf.qbs | 5 ++++-
src/plugins/analyzerbase/analyzerbase.qbs | 1 +
src/plugins/coreplugin/coreplugin.qbs | 3 ++-
src/plugins/debugger/debugger.qbs | 1 +
src/plugins/qmljseditor/qmljseditor.qbs | 2 +-
src/plugins/qmljsinspector/qmljsinspector.qbs | 2 +-
14 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index a41a3fee688..1cb68930dce 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -543,6 +543,7 @@ QtcLibrary {
}
ProductModule {
+ Depends { name: "cpp" }
cpp.linkerFlags: {
if (qbs.toolchain === 'mingw') {
return ['--enable-auto-import']
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index a1dbf427485..7f028e0b0be 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -177,6 +177,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: [
".",
"../3rdparty",
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index 75e39267091..e0a57520d5e 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -28,6 +28,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index bf8b1dec83f..8e7a5b61bf1 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -60,6 +60,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 46d6865171e..c5acea4832b 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -103,6 +103,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: [
".",
"parser"
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs b/src/libs/qmljsdebugclient/qmljsdebugclient.qbs
index 9ca80f21af1..63daa3ff297 100644
--- a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs
+++ b/src/libs/qmljsdebugclient/qmljsdebugclient.qbs
@@ -41,6 +41,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
Depends { name: "symbianutils" }
cpp.includePaths: [
"."
diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
index f9fadceb845..bb9b629a462 100644
--- a/src/libs/symbianutils/symbianutils.qbs
+++ b/src/libs/symbianutils/symbianutils.qbs
@@ -55,6 +55,7 @@ QtcLibrary {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: [
"../../shared/symbianutils",
"../../shared/json",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 31165a7d614..f1028757ef1 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -242,5 +242,9 @@ QtcLibrary {
"unixutils.cpp"
]
}
+
+ ProductModule {
+ Depends { name: "Qt"; submodules: ["widgets", "network"] }
+ }
}
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 17bf4d2cea8..865cae96296 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -34,5 +34,8 @@ QtcLibrary {
"syssocket.h"
]
- ProductModule { cpp.includePaths: "." }
+ ProductModule {
+ Depends { name: "cpp" }
+ cpp.includePaths: "."
+ }
}
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 9ca081487e4..3ecce0612ab 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -54,6 +54,7 @@ QtcPlugin {
]
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: [
"."
]
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 53dde483473..46f396fbcdf 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -241,13 +241,14 @@ QtcPlugin {
}
ProductModule {
+ Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
Depends { name: "Utils" }
cpp.includePaths: [
"../..",
"../../libs",
- buildDirectory + "/.obj/Core/actionmanager"
+ product.buildDirectory + "/.obj/Core/actionmanager"
]
}
}
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 4cf39f71e46..47a2a272027 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -305,6 +305,7 @@ QtcPlugin {
}
ProductModule {
+ Depends { name: "cpp" }
cpp.includePaths: ["."]
}
}
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 320aac6de8f..da5e7bbeb60 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlJSEditor"
- Depends { name: "qt"; submodules: ['gui'] }
+ Depends { name: "qt"; submodules: ['widgets', 'script'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs
index f76b02cc959..441d5393018 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.qbs
+++ b/src/plugins/qmljsinspector/qmljsinspector.qbs
@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlJSInspector"
- Depends { name: "qt"; submodules: ['gui'] }
+ Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlProjectManager" }
--
GitLab