diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 7b0565b0cdc00b030239c434b3769d12068927b1..9ca081487e476ceb91ea1597273a03afde6240c9 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "AnalyzerBase"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "RemoteLinux" }
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 8767e25cf4026c1c4d2becf27df32847d9535ff8..797529fcb34160864f83115a77596ac22b205dbe 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Bazaar"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index 7b1b13747bfd48002033f14c5a2e59a185c3267a..60f7cf4d2c65b73d7a4d96226102a6ebda3a1874 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "BinEditor"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "cpp" }
cpp.includePaths: [
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index 1a8138cf444b1525028081495e5a18c0d6985521..fa82cd1179ea9ddeaac488d5861d547a6be602e1 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -6,13 +6,10 @@ QtcPlugin {
name: "Bookmarks"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 59960d0d29f876c6c1afd9e7a5d0cb56781fd4e8..bd403fc787138eb571d1e94fdf7caef67feeae2c 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "ClassView"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 2f79c8e9719de9fc23f7b7e33565f5bfc685d82b..20e56ef700b19da5af0a078b9d9d7a2bd04c30df 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -6,13 +6,10 @@ QtcPlugin {
name: "CMakeProjectManager"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "CppTools" }
- Depends { name: "cplusplus" }
+ Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" }
Depends { name: "Locator" }
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 20afaa671f3de89cccd16904cc05642447e4b1a7..08717a054fd75e8fb7d8551010313f3b2a1e2f3d 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "CodePaster"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 704e2773877796d4cfc9e60c7df097c2cf336db2..0a0772c2068cceb7c6045f855c6e144f7fca939c 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -6,15 +6,11 @@ QtcPlugin {
name: "CppEditor"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
- Depends { name: "CPlusPlus" }
Depends { name: "cpp" }
cpp.includePaths: [
"..",
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 662c1dba23f7d7e388f617db7d5479a951ff611a..34bd225eaeaf03d46a472f14985cd1a1f1bf4d24 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -6,11 +6,8 @@ QtcPlugin {
name: "CppTools"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "Locator" }
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index b458ae5c9d777f3734c1908e599effe9d4452b58..604768f5d79f0837a1a7dd20138450fdfa54a576 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "CVS"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 2d35e31c5389112ce422fbf413601958ffe6c877..6b388894d794f1ebf7ef211d0bcf18aef7d79f2e 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -8,11 +8,10 @@ QtcPlugin {
Depends { name: "qt"; submodules: ['gui', 'network', 'script'] }
Depends { name: "Core" }
Depends { name: "CppTools" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "CPlusPlus" }
- Depends { name: "Utils" }
Depends { name: "symbianutils" }
Depends { name: "QmlJS" }
Depends { name: "QmlJSDebugClient" }
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index b1b08880f78b5241928e892712fc4fa023c9e3fa..ab38ea46f719b12a32a4d3d08ea344b26c1b71cc 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Designer"
Depends { name: "qt"; submodules: ['gui', 'xml', 'designer', 'designercomponents'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" }
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index cab0f0bebee9dba5cb637bc8f7eab6ef0bccc004..dec820c754a55e64c2a29c018bf411ec2824853d 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -5,12 +5,9 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "FakeVim"
- Depends { name: "aggregation" } // ### should be injected by product dependency "Core"
- Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
- Depends { name: "utils" } // ### should be injected by product dependency "Core"
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui'] }
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index ec0a04b0b239a9f24ca804eda991c86de4903414..3fec6f850e9b6ab3086e8ee7443c21847f7a97d4 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Find"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
- Depends { name: "utils" }
- Depends { name: "aggregation" }
- Depends { name: "extensionsystem" }
Depends { name: "Core" }
Depends { name: "cpp" }
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index c78fb5d4505a71c639d5d7656627e427ea148bd3..5f92346c3e5ccc194d62d9a0caf5ae4fa2ea57d6 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -6,16 +6,13 @@ QtcPlugin {
name: "GenericProjectManager"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
- Depends { name: "find" }
- Depends { name: "locator" }
+ Depends { name: "Find" }
+ Depends { name: "Locator" }
Depends { name: "cpp" }
cpp.includePaths: [
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 8cbffda470860684beb8d5231084a2ec4687d00d..9c3f307c63d9abe7b02cb0ff03181e539af95ac4 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "Git"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 19534a24e22237aa751dfecfbce9dd7d7e7043bc..ae591c039fd4b7f286955d5e15acfce8f6ecac63 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "GLSLEditor"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index 213f7300079ce06fea3866ac90b3ed7c26aa32c5..e02cf01552791948749a51a678be86310bd0db81 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -5,9 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "HelloWorld"
- Depends { name: "aggregation" } // ### should be injected by product dependency "Core"
- Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
- Depends { name: "utils" } // ### should be injected by product dependency "Core"
Depends { name: "Core" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index e81f96d65998bc6ddae3d54b3a29ed424ccc047d..62c09e1d5ff0e2546dbf70410405b84c8c5f4fe8 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -6,11 +6,8 @@ QtcPlugin {
name: "Help"
Depends { name: "qt"; submodules: ['gui', 'help', 'webkit'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "Locator" }
Depends { name: "cpp" }
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 04da46e8f411c408658992a792c2362864a13781..7d7ad717617fb8cca06394d8fe6de0c72fbd73bf 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "ImageViewer"
Depends { name: "qt"; submodules: ['gui', 'svg'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "cpp" }
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index 5d8cd234d7567ad82f9cae3b4f5c913ef0624fca..467ae5b981a9ef96d5aa40edd7a23f22247b38e9 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Locator"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
- Depends { name: "aggregation" }
- Depends { name: "extensionsystem" }
- Depends { name: "utils" }
Depends { name: "Core" }
Depends { name: "cpp" }
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 4a5d073439b43b798a1d5f7008da6d58dbcd41a2..329404c73ef7e79c3eb542f0dccea47013e8dc88 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "Macros"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "Locator" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 6d1a81aba6d15c567eccbad51f8d7f85e6784233..cf0495af48b8a44f1762148ab9fcb571645c4030 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "Mercurial"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index 8b5d84dbd278261109d0df078a083221466fa4fa..e1bc71e92983294acfe5b02c650799e8553b14f8 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "Perforce"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index ad7dc562bdaf22c30305e153ec8bc2758809c195..539ec48d0343807788cd86f98e303dc4e3b8a85f 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -5,12 +5,9 @@ QtcPlugin {
name: "ProjectExplorer"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
- Depends { name: "locator" }
- Depends { name: "find" }
+ Depends { name: "Locator" }
+ Depends { name: "Find" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
index 3efa362110868d89dc81cca145dd51df1e087463..459415fc2dff9fb62d00e1b99a8e6fb64d8c01f0 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.qbs
+++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QmlDesigner"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "QmlJS" }
Depends { name: "QmlEditorWidgets" }
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index bde84961fe68585c04adffb664e1ae9283ef4721..320aac6de8faebd3e04f743789732a6405bd5443 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -6,16 +6,13 @@ QtcPlugin {
name: "QmlJSEditor"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlJSTools" }
Depends { name: "QmlJS" }
Depends { name: "LanguageUtils" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "QmlEditorWidgets" }
Depends { name: "CPlusPlus" }
diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs
index 56bfeaded8751618f1072f3ddbc1bb0e452308b5..f76b02cc959596bc8ec7f56e11f129372e7e620a 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.qbs
+++ b/src/plugins/qmljsinspector/qmljsinspector.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QmlJSInspector"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlProjectManager" }
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 6d37d644bc55eb6df06355d542a3fc9f95ea8efd..463661112923c866780814380bf9a227c2244253 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QmlJSTools"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "LanguageUtils" }
Depends { name: "CPlusPlus" }
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 7b7b242eda2f9cd85cf123d1107b4164d73a774d..13cbca838c652f47073b7e66e4cafb24d1241f43 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QmlProfiler"
Depends { name: "qt"; submodules: ['gui', 'network', 'script', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "QmlProjectManager" }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 7452bf118c27751e83ea79831c296e26876714dd..5148970783b00296db583a56d8e5b71d4c2b059b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QmlProjectManager"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index e64c08de077d82ca4b547ce8e136e669710afab9..885028a48ff420543fdaecf7ffdb1be989089093 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Qt4ProjectManager"
Depends { name: "qt"; submodules: ['gui', 'network'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
@@ -17,7 +14,7 @@ QtcPlugin {
Depends { name: "symbianutils" }
Depends { name: "QmlJS" }
Depends { name: "botan" }
- Depends { name: "cplusplus" }
+ Depends { name: "CPlusPlus" }
Depends { name: "TextEditor" }
Depends { name: "cpp" }
@@ -307,7 +304,3 @@ QtcPlugin {
"wizards/images/qtquickapp.png"
]
}
-
-
-
-
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 7310899b77445e0fa1d390d21132636b35751d62..76af762801c67034b27110b5f6a03eb185e71f21 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "QtSupport"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index c96ae4e526832eba4afc2b49dd9956853e564a5e..4ebd6d01cf944090525c4f57d4852ce9a4e952a8 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "RemoteLinux"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "Debugger" }
Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index a11a6367ddf63fbd0bdf324a5d64de15d36a15e0..555637da166ad3c0c3018e1cfa63aa6c9c4cfeed 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -5,9 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "ResourceEditor"
- Depends { name: "aggregation" } // ### should be injected by product dependency "Core"
- Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
- Depends { name: "utils" } // ### should be injected by product dependency "Core"
Depends { name: "Core" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui', 'xml'] }
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 471e8eb7baa4885defbca5b2e7d9f25eefd4383f..a012249099b64103a54e42966b240db66e2b32f2 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "Subversion"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "TextEditor" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "VcsBase" }
Depends { name: "Locator" }
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 977e95b3d449d56604f487c39c4237e01e3f5abf..caaf0a2cd68aad80786907da2bedda054d93eb1a 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -6,12 +6,9 @@ QtcPlugin {
name: "TaskList"
Depends { name: "qt"; submodules: ['gui'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "Locator" }
Depends { name: "TextEditor" }
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index d9ff3f4d280c7bbe395f4e68911a52f6b4fb9fb2..23a433a32759f490545dc1127ab0e7395ab34add 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -6,11 +6,8 @@ QtcPlugin {
name: "TextEditor"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
- Depends { name: "utils" }
- Depends { name: "aggregation" }
- Depends { name: "extensionsystem" }
- Depends { name: "find" }
- Depends { name: "locator" }
+ Depends { name: "Find" }
+ Depends { name: "Locator" }
Depends { name: "Core" }
Depends { name: "cpp" }
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index b1d99cda6cd53be835c0a97c1b9b324a776c7f1f..bdfc90c73751a610f70c656009647c8266a504c6 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Valgrind"
Depends { name: "qt"; submodules: ['gui', 'network'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index fcbcdc660a1a254c33c3c5837e129650bf7c158a..3db7e2c69bb936e74e18de5523853dc3bf7b55a9 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -5,13 +5,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "VcsBase"
- Depends { name: "aggregation" } // ### should be injected by product dependency "Core"
- Depends { name: "extensionsystem" } // ### should be injected by product dependency "Core"
- Depends { name: "utils" } // ### should be injected by product dependency "Core"
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
- Depends { name: "find" }
+ Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "CPlusPlus" }
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 9e5e7ca36fb1a6569d39576ff964c1ebb959584b..83b9d933e75c3d16079a5868a3b39b69d8fe61e7 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -6,9 +6,6 @@ QtcPlugin {
name: "Welcome"
Depends { name: "qt"; submodules: ['gui', 'network', 'declarative'] }
- Depends { name: "utils" }
- Depends { name: "extensionsystem" }
- Depends { name: "aggregation" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }