summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-05-27 10:06:36 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-05-27 17:59:12 +0200
commit24e81241a5a09c3522b2d6768112de4f1448bc53 (patch)
tree8c626970fa067fe501eaef2f7a457599795aa964
parent97952cfde2ff887715661270c85ac9e561391995 (diff)
downloadqt-creator-24e81241a5a09c3522b2d6768112de4f1448bc53.tar.gz
Remove duplicate module dependencies from qbs files.
These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/libs/aggregation/aggregation.qbs1
-rw-r--r--src/libs/cplusplus/cplusplus.qbs2
-rw-r--r--src/libs/extensionsystem/extensionsystem.qbs1
-rw-r--r--src/libs/glsl/glsl.qbs1
-rw-r--r--src/libs/languageutils/languageutils.qbs1
-rw-r--r--src/libs/qmldebug/qmldebug.qbs1
-rw-r--r--src/libs/qmleditorwidgets/qmleditorwidgets.qbs1
-rw-r--r--src/libs/qmljs/qmljs.qbs2
-rw-r--r--src/libs/ssh/ssh.qbs1
-rw-r--r--src/libs/utils/process_ctrlc_stub.qbs1
-rw-r--r--src/libs/utils/process_stub.qbs1
-rw-r--r--src/libs/utils/utils.qbs4
-rw-r--r--src/libs/zeroconf/zeroconf.qbs1
-rw-r--r--src/plugins/analyzerbase/analyzerbase.qbs1
-rw-r--r--src/plugins/bazaar/bazaar.qbs1
-rw-r--r--src/plugins/classview/classview.qbs1
-rw-r--r--src/plugins/coreplugin/coreplugin.qbs1
-rw-r--r--src/plugins/cpaster/cpaster.qbs1
-rw-r--r--src/plugins/cpaster/frontend/frontend.qbs1
-rw-r--r--src/plugins/cppeditor/cppeditor.qbs1
-rw-r--r--src/plugins/debugger/debugger.qbs1
-rw-r--r--src/plugins/debugger/ptracepreload.qbs1
-rw-r--r--src/plugins/designer/designer.qbs1
-rw-r--r--src/plugins/diffeditor/diffeditor.qbs1
-rw-r--r--src/plugins/find/find.qbs1
-rw-r--r--src/plugins/help/help.qbs1
-rw-r--r--src/plugins/locator/locator.qbs1
-rw-r--r--src/plugins/projectexplorer/projectexplorer.qbs1
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.qbs1
-rw-r--r--src/plugins/qmldesigner/qmldesigner.qbs1
-rw-r--r--src/plugins/qmljseditor/qmljseditor.qbs1
-rw-r--r--src/plugins/qmljstools/qmljstools.qbs1
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.qbs1
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectmanager.qbs1
-rw-r--r--src/plugins/qt4projectmanager/qt4projectmanager.qbs1
-rw-r--r--src/plugins/qtsupport/qtsupport.qbs1
-rw-r--r--src/plugins/remotelinux/remotelinux.qbs1
-rw-r--r--src/plugins/resourceeditor/resourceeditor.qbs1
-rw-r--r--src/plugins/updateinfo/updateinfo.qbs1
-rw-r--r--src/plugins/vcsbase/vcsbase.qbs1
-rw-r--r--src/plugins/welcome/welcome.qbs1
-rw-r--r--src/tools/qtcdebugger/qtcdebugger.qbs1
-rw-r--r--src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs1
-rw-r--r--src/tools/qtpromaker/qtpromaker.qbs1
-rw-r--r--src/tools/sdktool/sdktool.qbs1
45 files changed, 0 insertions, 50 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(".")
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 26073fdbdd..e3b9641c05 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/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: [
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index b43ff69dd0..c885f49be1 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 338cec83eb..be6ab5b42f 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 d8ebbd8b78..2671e15bee 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -252,7 +252,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 14cf63b416..9bc42c490c 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 922fb3b7b3..87262aa3d6 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 2483877414..e17d4ec8db 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 08e50e0622..f7ff386401 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",
"lldb",
diff --git a/src/plugins/debugger/ptracepreload.qbs b/src/plugins/debugger/ptracepreload.qbs
index 3e2de1517b..ee9835f19d 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 f30940b731..18a9aa76ed 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 568321d149..c2414e5a62 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: [
"diffeditorplugin.cpp",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 7b8287e5be..bcc177d707 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 90c215d1ec..dec5fb2011 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 af809cfd84..c5c99a328a 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 1dc3fc9d93..05f971036f 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 17ddb68285..3cf37e5aa2 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 21000dade9..f24e75bd3d 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 f49470b8ab..e4b4208a8e 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" }
- Depends { name: "cpp" }
cpp.defines: base.concat("QT_CREATOR")
files: [
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 3848531bd5..682dc34de1 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 09044ab842..272d91f7ac 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
Depends { name: "QmlJSTools" }
Depends { name: "CPlusPlus" }
- Depends { name: "cpp" }
cpp.includePaths: base.concat("canvas")
files: [
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 06527a9462..a4aff8401b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProjectManager"
- Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 1aee5b998b..186f2a51a7 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.defines: base.concat([
"PROPARSER_AS_LIBRARY",
"PROPARSER_THREAD_SAFE",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 87549bb8ca..0098ad1592 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/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 8e3b4e3544..577d4f6c39 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "RemoteLinux"
- Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "Core" }
Depends { name: "Debugger" }
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 889bd951f2..eb049c70ad 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 2d30541084..0063247ce5 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 b5265d7b8c..97e6a11b64 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 a99fe82ab9..39bc5b152b 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 5b86287746..8edb4cc342 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 35d6187d56..9e523222f0 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 c6b761f58c..7c441d8fec 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 7d8e571a90..fc80c51bc3 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" }