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>

diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index a41a3fe..1cb6893 100644 (file)
--- 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 a1dbf42..7f028e0 100644 (file)
--- 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 75e3926..e0a5752 100644 (file)
--- 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 bf8b1de..8e7a5b6 100644 (file)
--- 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 46d6865..c5acea4 100644 (file)
--- 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 9ca80f2..63daa3f 100644 (file)
--- 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 f9fadce..bb9b629 100644 (file)
--- 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 31165a7..f102875 100644 (file)
--- 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 17bf4d2..865cae9 100644 (file)
--- 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 9ca0814..3ecce06 100644 (file)
--- 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 53dde48..46f396f 100644 (file)
--- 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 4cf39f7..47a2a27 100644 (file)
--- 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 320aac6..da5e7bb 100644 (file)
--- 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 f76b02c..441d539 100644 (file)
--- 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" }