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

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

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

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

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

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

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

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

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: [
         "..",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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