Remove duplicate module dependencies from qbs files.

These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

13 files changed, 0 insertions, 18 deletions

diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index b3ab339798..2c299fc432 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "Aggregation"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.core" }
     cpp.defines: base.concat("AGGREGATION_LIBRARY")
 
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 7b52710a34..8a450dd701 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -11,7 +11,6 @@ QtcLibrary {
     ])
     cpp.optimization: "fast"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
 
     Group {
@@ -169,7 +168,6 @@ QtcLibrary {
     ]
 
     Export {
-        Depends { name: "cpp" }
         cpp.includePaths: [
             ".",
             "../3rdparty",
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index f7a90814cb..250a3c69dd 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -9,7 +9,6 @@ QtcLibrary {
         "IDE_TEST_DIR=\".\""
     ])
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["core", "widgets"] }
     Depends { name: "Aggregation" }
 
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index fc5c0ab7f5..c1e108104f 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -9,7 +9,6 @@ QtcLibrary {
         "GLSL_BUILD_LIB"
     ])
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.gui" }
 
     files: [
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index 811c4a9609..c940d6b25b 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -11,7 +11,6 @@ QtcLibrary {
     ])
     cpp.optimization: "fast"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.core" }
 
     files: [
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index beba356937..601c0e4c5d 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -6,7 +6,6 @@ QtcLibrary {
 
     cpp.defines: base.concat("QMLDEBUG_LIB")
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["gui", "network"] }
 
     files: [
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index 19099b4156..f2b6953a29 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -12,7 +12,6 @@ QtcLibrary {
     ])
     cpp.optimization: "fast"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 10d5166345..b9aeef74e6 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -13,7 +13,6 @@ QtcLibrary {
 
     Depends { name: "Utils" }
     Depends { name: "LanguageUtils" }
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "script"] }
 
     files: [
@@ -108,7 +107,6 @@ QtcLibrary {
     ]
 
     Export {
-        Depends { name: "cpp" }
         Depends { name: "LanguageUtils" }
         cpp.defines: [
             "QT_CREATOR"
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 571821c22c..91edc1414d 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -8,7 +8,6 @@ QtcLibrary {
     cpp.includePaths: botanIncludes
     cpp.dynamicLibraries: botanLibs
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "network" ] }
 
     files: [
diff --git a/src/libs/utils/process_ctrlc_stub.qbs b/src/libs/utils/process_ctrlc_stub.qbs
index e09f5756be..ea4319ae4e 100644
--- a/src/libs/utils/process_ctrlc_stub.qbs
+++ b/src/libs/utils/process_ctrlc_stub.qbs
@@ -6,7 +6,6 @@ QtcTool {
     consoleApplication: true
     condition: qbs.targetOS == "windows"
 
-    Depends { name: "cpp" }
 
     files: [ "process_ctrlc_stub.cpp" ]
 
diff --git a/src/libs/utils/process_stub.qbs b/src/libs/utils/process_stub.qbs
index e40ed86675..9682edd281 100644
--- a/src/libs/utils/process_stub.qbs
+++ b/src/libs/utils/process_stub.qbs
@@ -5,7 +5,6 @@ QtcTool {
     name: "qtcreator_process_stub"
     consoleApplication: true
 
-    Depends { name: "cpp" }
 
     files: {
         if (qbs.targetOS == "windows") {
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 3f5e8f9872..48c26a0ca0 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -19,7 +19,6 @@ QtcLibrary {
         cpp.dynamicLibraries: ["X11"]
     }
 
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] }
     Depends { name: "app_version_header" }
 
@@ -212,10 +211,7 @@ QtcLibrary {
     }
 
     Export {
-        // ### [ remove, once qbs supports merging of Export items in derived products
-        Depends { name: "cpp" }
         cpp.includePaths: [ ".." ]
-        // ### ]
         Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
     }
 }
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 51ca09d0f1..2b19a6599e 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "zeroconf"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.network" }
     cpp.includePaths: base.concat(".")