Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11

42 files changed, 0 insertions, 48 deletions

diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index b3ab3397987..2c299fc4326 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 31ea51c9400..c9c9c941e63 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 f7a90814cb2..250a3c69dd9 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 5418b7d82b5..7c8c0304e1d 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -8,7 +8,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 51926067c2d..88bc82979ec 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -10,7 +10,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 beba3569377..601c0e4c5d1 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 e943f32c1ca..d6ae739b314 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -11,7 +11,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 4253e0bb09c..2bef9864c4c 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -12,7 +12,6 @@ QtcLibrary {
 
     Depends { name: "Utils" }
     Depends { name: "LanguageUtils" }
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "script"] }
 
     files: [
@@ -107,7 +106,6 @@ QtcLibrary {
     ]
 
     Export {
-        Depends { name: "cpp" }
         Depends { name: "LanguageUtils" }
     }
 }
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 571821c22c9..91edc1414d3 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 e09f5756bef..ea4319ae4ee 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 e40ed866759..9682edd281e 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 b8f9bd76325..a2efd78a208 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 51ca09d0f1e..2b19a6599e4 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(".")
 
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index b43ff69dd06..c885f49be17 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "VcsBase" }
     Depends { name: "Locator" }
 
-    Depends { name: "cpp" }
 
     files: [
         "annotationhighlighter.cpp",
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 338cec83eb1..be6ab5b42f2 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
-    Depends { name: "cpp" }
 
     files: [
         "classview.qrc",
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index d48f09016e4..11f50003d07 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -255,7 +255,6 @@ QtcPlugin {
     }
 
     Export {
-        Depends { name: "cpp" }
         Depends { name: "Aggregation" }
         Depends { name: "Utils" }
     }
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 14cf63b416f..9bc42c490c4 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/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: [
diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs
index 922fb3b7b3b..87262aa3d64 100644
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/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"]
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index d5698f73650..6dbbff538d4 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/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")
 
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 1dbbd6f4db2..d88065a8d7c 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "QtcSsh" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat([
         "shared",
         "lldblib",
diff --git a/src/plugins/debugger/ptracepreload.qbs b/src/plugins/debugger/ptracepreload.qbs
index 3e2de1517be..ee9835f19db 100644
--- a/src/plugins/debugger/ptracepreload.qbs
+++ b/src/plugins/debugger/ptracepreload.qbs
@@ -10,7 +10,6 @@ QtcLibrary {
         "c"
     ]
 
-    Depends { name: "cpp" }
 
     files: [
         "ptracepreload.c",
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index f30940b7316..18a9aa76ed5 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
 
-    Depends { name: "cpp" }
     cpp.defines: base.concat(["CPP_ENABLED"])
     cpp.includePaths: base.concat([
         "../../libs/3rdparty",
diff --git a/src/plugins/diffeditor/diffeditor.qbs b/src/plugins/diffeditor/diffeditor.qbs
index 6d472cbc75e..1b1d5fd974c 100644
--- a/src/plugins/diffeditor/diffeditor.qbs
+++ b/src/plugins/diffeditor/diffeditor.qbs
@@ -10,7 +10,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
 
-    Depends { name: "cpp" }
 
     files: [
         "diffeditor_global.h",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 7b8287e5be9..bcc177d707f 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -7,7 +7,6 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
     Depends { name: "Core" }
-    Depends { name: "cpp" }
 
     cpp.includePaths: base.concat([
         "generichighlighter",
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 90c215d1ec5..dec5fb2011f 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
     Depends { name: "Locator" }
     Depends { name: "app_version_header" }
 
-    Depends { name: "cpp" }
 
     cpp.defines: {
         var list = base;
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index af809cfd841..c5c99a328ad 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -7,7 +7,6 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
     Depends { name: "Core" }
-    Depends { name: "cpp" }
 
     cpp.includePaths: base.concat([
         "generichighlighter",
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 3b9252f26d4..d7519ee6ef7 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "QtcSsh" }
 
-    Depends { name: "cpp" }
     cpp.defines: base.concat("QTC_CPU=X86Architecture")
     cpp.includePaths: base.concat([
         "customwizard",
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
index 6f603c26e7b..ffb14bee5c5 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
 
-    Depends { name: "cpp" }
 
     cpp.includePaths: base.concat([
         qbs_source_dir + "/src",
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index 21000dade97..f24e75bd3d8 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
     Depends { name: "LanguageUtils" }
     Depends { name: "QtSupport" }
 
-    Depends { name: "cpp" }
     cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
     cpp.includePaths: base.concat([
         "designercore",
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 8ee25012060..32d3ef4d359 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -16,8 +16,6 @@ QtcPlugin {
     Depends { name: "QmlEditorWidgets" }
     Depends { name: "CPlusPlus" }
 
-    Depends { name: "cpp" }
-
     files: [
         "QmlJSEditor.mimetypes.xml",
         "jsfilewizard.cpp",
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 3848531bd52..682dc34de17 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat("../../libs/3rdparty")
 
     files: [
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 7567289cc7a..cb136bf4d83 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
     Depends { name: "QmlJSTools" }
     Depends { name: "CPlusPlus" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat("canvas")
 
     files: [
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 27431351ee0..ccf3a654fbb 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "QmlJSTools" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat([
         "customwidgetwizard",
         "../../shared",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 841c171015b..37637338cf1 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -11,7 +11,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "QmlJS" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat([
         "../../shared",
         "../../shared/proparser"
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 889bd951f29..eb049c70adb 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -7,7 +7,6 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "Find" }
-    Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: ["widgets", "xml"] }
 
     cpp.includePaths: base.concat("qrceditor")
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 2d305410840..0063247ce5e 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "UpdateInfo"
 
-    Depends { name: "cpp" }
     Depends { name: "Core" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index b5265d7b8cc..97e6a11b64a 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "Find" }
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "CppTools" }
     Depends { name: "CPlusPlus" }
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index a99fe82ab9b..39bc5b152b5 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
 
-    Depends { name: "cpp" }
     cpp.includePaths: base.concat("../../shared/scriptwrapper")
 
     files: [
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index 5b862877465..8edb4cc3428 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -14,7 +14,6 @@ QtcTool {
         "advapi32"
     ]
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "app_version_header" }
 
diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
index 35d6187d568..9e523222f01 100644
--- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
+++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
@@ -10,7 +10,6 @@ QtcTool {
         "../../libs"
     ]
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.widgets" }
     Depends { name: "app_version_header" }
 
diff --git a/src/tools/qtpromaker/qtpromaker.qbs b/src/tools/qtpromaker/qtpromaker.qbs
index c6b761f58c5..7c441d8fec7 100644
--- a/src/tools/qtpromaker/qtpromaker.qbs
+++ b/src/tools/qtpromaker/qtpromaker.qbs
@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
 QtcTool {
     name: "qtpromaker"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.core" }
 
     files: [ "main.cpp" ]
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index 7d8e571a909..fc80c51bc32 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
 QtcTool {
     name: "sdktool"
 
-    Depends { name: "cpp" }
     Depends { name: "Qt.core" }
     Depends { name: "Utils" }
     Depends { name: "app_version_header" }