From 164db0feeb4bd31d09eb963ee6d7baace8afc09e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Mon, 27 Feb 2012 21:09:42 +0200
Subject: [PATCH] qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus
Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
src/plugins/analyzerbase/analyzerbase.qbs | 3 ---
src/plugins/bazaar/bazaar.qbs | 3 ---
src/plugins/bineditor/bineditor.qbs | 5 +----
src/plugins/bookmarks/bookmarks.qbs | 5 +----
src/plugins/classview/classview.qbs | 3 ---
src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs | 5 +----
src/plugins/cpaster/cpaster.qbs | 3 ---
src/plugins/cppeditor/cppeditor.qbs | 4 ----
src/plugins/cpptools/cpptools.qbs | 5 +----
src/plugins/cvs/cvs.qbs | 5 +----
src/plugins/debugger/debugger.qbs | 3 +--
src/plugins/designer/designer.qbs | 3 ---
src/plugins/fakevim/fakevim.qbs | 5 +----
src/plugins/find/find.qbs | 3 ---
.../genericprojectmanager/genericprojectmanager.qbs | 7 ++-----
src/plugins/git/git.qbs | 5 +----
src/plugins/glsleditor/glsleditor.qbs | 3 ---
src/plugins/helloworld/helloworld.qbs | 3 ---
src/plugins/help/help.qbs | 5 +----
src/plugins/imageviewer/imageviewer.qbs | 3 ---
src/plugins/locator/locator.qbs | 3 ---
src/plugins/macros/macros.qbs | 5 +----
src/plugins/mercurial/mercurial.qbs | 5 +----
src/plugins/perforce/perforce.qbs | 5 +----
src/plugins/projectexplorer/projectexplorer.qbs | 7 ++-----
src/plugins/qmldesigner/qmldesignerplugin.qbs | 3 ---
src/plugins/qmljseditor/qmljseditor.qbs | 5 +----
src/plugins/qmljsinspector/qmljsinspector.qbs | 3 ---
src/plugins/qmljstools/qmljstools.qbs | 3 ---
src/plugins/qmlprofiler/qmlprofiler.qbs | 3 ---
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 3 ---
src/plugins/qt4projectmanager/qt4projectmanager.qbs | 9 +--------
src/plugins/qtsupport/qtsupport.qbs | 3 ---
src/plugins/remotelinux/remotelinux.qbs | 3 ---
src/plugins/resourceeditor/resourceeditor.qbs | 3 ---
src/plugins/subversion/subversion.qbs | 5 +----
src/plugins/tasklist/tasklist.qbs | 5 +----
src/plugins/texteditor/texteditor.qbs | 7 ++-----
src/plugins/valgrind/valgrind.qbs | 3 ---
src/plugins/vcsbase/vcsbase.qbs | 5 +----
src/plugins/welcome/welcome.qbs | 3 ---
41 files changed, 23 insertions(+), 149 deletions(-)
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 7b0565b0cdc..9ca081487e4 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 8767e25cf40..797529fcb34 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 7b1b13747bf..60f7cf4d2c6 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 1a8138cf444..fa82cd1179e 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 59960d0d29f..bd403fc7871 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 2f79c8e9719..20e56ef700b 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 20afaa671f3..08717a054fd 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 704e2773877..0a0772c2068 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 662c1dba23f..34bd225eaea 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 b458ae5c9d7..604768f5d79 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 2d35e31c538..6b388894d79 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 b1b08880f78..ab38ea46f71 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 cab0f0bebee..dec820c754a 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 ec0a04b0b23..3fec6f850e9 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 c78fb5d4505..5f92346c3e5 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 8cbffda4708..9c3f307c63d 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 19534a24e22..ae591c039fd 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 213f7300079..e02cf015527 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 e81f96d6599..62c09e1d5ff 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 04da46e8f41..7d7ad717617 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 5d8cd234d75..467ae5b981a 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 4a5d073439b..329404c73ef 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 6d1a81aba6d..cf0495af48b 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 8b5d84dbd27..e1bc71e9298 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 ad7dc562bda..539ec48d034 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 3efa3621108..459415fc2df 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 bde84961fe6..320aac6de8f 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 56bfeaded87..f76b02cc959 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 6d37d644bc5..46366111292 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 7b7b242eda2..13cbca838c6 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 7452bf118c2..5148970783b 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 e64c08de077..885028a48ff 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 7310899b774..76af762801c 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 c96ae4e5268..4ebd6d01cf9 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 a11a6367ddf..555637da166 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 471e8eb7baa..a012249099b 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 977e95b3d44..caaf0a2cd68 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 d9ff3f4d280..23a433a3275 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 b1d99cda6cd..bdfc90c7375 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 fcbcdc660a1..3db7e2c69bb 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 9e5e7ca36fb..83b9d933e75 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" }
--
GitLab