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

@@ -543,6 +543,7 @@ QtcLibrary {
     }
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.linkerFlags: {
             if (qbs.toolchain === 'mingw') {
                 return ['--enable-auto-import']

src/libs/cplusplus/cplusplus.qbs

@@ -177,6 +177,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
             "../3rdparty",

src/libs/glsl/glsl.qbs

@@ -28,6 +28,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

@@ -60,6 +60,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }

src/libs/qmljs/qmljs.qbs

@@ -103,6 +103,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
             "parser"

src/libs/qmljsdebugclient/qmljsdebugclient.qbs

@@ -41,6 +41,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         Depends { name: "symbianutils" }
         cpp.includePaths: [
             "."

src/libs/symbianutils/symbianutils.qbs

@@ -55,6 +55,7 @@ QtcLibrary {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             "../../shared/symbianutils",
             "../../shared/json",

src/libs/utils/utils.qbs

@@ -242,5 +242,9 @@ QtcLibrary {
             "unixutils.cpp"
         ]
     }
+
+    ProductModule {
+        Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    }
 }
 

src/libs/zeroconf/zeroconf.qbs

@@ -34,5 +34,8 @@ QtcLibrary {
         "syssocket.h"
     ]
 
-    ProductModule { cpp.includePaths: "." }
+    ProductModule {
+        Depends { name: "cpp" }
+        cpp.includePaths: "."
+    }
 }

src/plugins/analyzerbase/analyzerbase.qbs

@@ -54,6 +54,7 @@ QtcPlugin {
     ]
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: [
             "."
         ]

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"
         ]
     }
 }

src/plugins/debugger/debugger.qbs

@@ -305,6 +305,7 @@ QtcPlugin {
     }
 
     ProductModule {
+        Depends { name: "cpp" }
         cpp.includePaths: ["."]
     }
 }

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" }

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" }