Remove duplicate module dependencies from qbs files.

These cause a warning now.

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

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

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

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

src/libs/glsl/glsl.qbs

@@ -9,7 +9,6 @@ QtcLibrary {
         "GLSL_BUILD_LIB"
     ])
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.gui" }
 
     files: [

src/libs/languageutils/languageutils.qbs

@@ -11,7 +11,6 @@ QtcLibrary {
     ])
     cpp.optimization: "fast"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.core" }
 
     files: [

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: [

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

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"

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: [

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

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") {

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

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(".")
 

src/plugins/analyzerbase/analyzerbase.qbs

@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
     cpp.defines: base.concat("ANALYZER_LIBRARY")
 
     files: [

src/plugins/bazaar/bazaar.qbs

@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
 
     files: [
         "annotationhighlighter.cpp",

src/plugins/classview/classview.qbs

@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
 
     files: [
         "classview.qrc",

src/plugins/coreplugin/coreplugin.qbs

@@ -252,7 +252,6 @@ QtcPlugin {
     }
 
     Export {
-        Depends { name: "cpp" }
         Depends { name: "Aggregation" }
         Depends { name: "Utils" }
     }

src/plugins/cpaster/cpaster.qbs

@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat("../../shared/cpaster")
 
     files: [

src/plugins/cpaster/frontend/frontend.qbs

@@ -4,7 +4,6 @@ import "../../../tools/QtcTool.qbs" as QtcTool
 QtcTool {
     name: "cpaster"
 
-    Depends { name: "cpp" }
     Depends {
         name: "Qt"
         submodules: ["gui", "network"]

src/plugins/cppeditor/cppeditor.qbs

@@ -13,7 +13,6 @@ QtcPlugin {
     Depends { name: "CPlusPlus" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "cpp" }
 
     cpp.includePaths: base.concat("../../libs/3rdparty")