auto-generate <dependencyList> in .pluginspec files

Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-26 16:58:50 +01:00
parent 740d177a04
commit f9f8cd354b
60 changed files with 106 additions and 273 deletions
--- a/qbs/pluginspec/pluginspec.qbs
+++ b/qbs/pluginspec/pluginspec.qbs
@@ -29,6 +29,18 @@ Module {
            cmd.ide_version_release = product.moduleProperty("pluginspec", "ide_version_release");

            cmd.pluginspecreplacements = product.moduleProperty("pluginspec", "pluginspecreplacements");
+            cmd.plugin_depends = [];
+            var deps = product.dependencies;
+            for (var d in deps) {
+                var depdeps = deps[d].dependencies;
+                for (var dd in depdeps) {
+                    if (depdeps[dd].name == 'pluginspec') {
+                        cmd.plugin_depends.push(deps[d].name);
+                        break;
+                    }
+                }
+            }
+            cmd.plugin_recommends = product.pluginRecommends

            cmd.sourceCode = function() {
                var i;
@@ -42,6 +54,15 @@ Module {
                vars['IDE_VERSION_MAJOR'] = ide_version_major;
                vars['IDE_VERSION_MINOR'] = ide_version_minor;
                vars['IDE_VERSION_RELEASE'] = ide_version_release;
+                var deplist = ["<dependencyList>"];
+                for (i in plugin_depends) {
+                    deplist.push("        <dependency name=\"" + plugin_depends[i] + "\" version=\"" + qtcreator_version + "\"/>");
+                }
+                for (i in plugin_recommends) {
+                    deplist.push("        <dependency name=\"" + plugin_recommends[i] + "\" version=\"" + qtcreator_version + "\" type=\"optional\"/>");
+                }
+                deplist.push("    </dependencyList>");
+                vars['dependencyList'] = deplist.join("\n");
                for (i in vars) {
                    all = all.replace(new RegExp('\\\$\\\$' + i + '(?!\w)', 'g'), vars[i]);
                }
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -6,6 +6,7 @@ Product {
    type: ["dynamiclibrary", "pluginSpec"]
    property string provider: 'QtProject'
    property var pluginspecreplacements
+    property var pluginRecommends: []
    targetName: {
        // see PluginSpecPrivate::loadLibrary()
        if (qbs.debugInformation) {
--- a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
+++ b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Code Analyzer</category>
    <description>Code Analyzer Base Plugin</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/android/Android.pluginspec.in
+++ b/src/plugins/android/Android.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <description>Support for deployment to and execution on Android Devices</description>
    <category>Device Support</category>
    <url>http://necessitas.kde.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
+++ b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>Autotools project integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/bazaar/Bazaar.pluginspec.in
+++ b/src/plugins/bazaar/Bazaar.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Bazaar integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/bineditor/BinEditor.pluginspec.in
+++ b/src/plugins/bineditor/BinEditor.pluginspec.in
@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Binary editor component.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/bookmarks/Bookmarks.pluginspec.in
+++ b/src/plugins/bookmarks/Bookmarks.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Bookmarks in text editors.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/classview/ClassView.pluginspec.in
+++ b/src/plugins/classview/ClassView.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>C++</category>
    <description>Class View component.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/clearcase/ClearCase.pluginspec.in
+++ b/src/plugins/clearcase/ClearCase.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>ClearCase integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
+++ b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
@@ -13,11 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>CMake support</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -14,6 +14,10 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "QtSupport" }

+    pluginRecommends: [
+        "Designer"
+    ]
+
    files: [
        "CMakeProject.mimetypes.xml",
        "cmakebuildconfiguration.cpp",
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
@@ -4,3 +4,5 @@ QTC_PLUGIN_DEPENDS += \
    cpptools \
    texteditor \
    qtsupport
+QTC_PLUGIN_RECOMMENDS += \
+    designer
--- a/src/plugins/cpaster/CodePaster.pluginspec.in
+++ b/src/plugins/cpaster/CodePaster.pluginspec.in
@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    </license>
    <description>Codepaster plugin for pushing/fetching diff from server</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/cppeditor/CppEditor.pluginspec.in
+++ b/src/plugins/cppeditor/CppEditor.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>C++</category>
    <description>C/C++ editor component.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/cpptools/CppTools.pluginspec.in
+++ b/src/plugins/cpptools/CppTools.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>C++</category>
    <description>Tools for analyzing C/C++ code.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/cvs/CVS.pluginspec.in
+++ b/src/plugins/cvs/CVS.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>CVS integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/debugger/Debugger.pluginspec.in
+++ b/src/plugins/debugger/Debugger.pluginspec.in
@@ -13,14 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Debugger integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <!-- Debugger plugin adds items to the editor\'s context menu -->
-        <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
-    </dependencyList>
+    $$dependencyList
    <argumentList>
        <argument name=\"-debug\" parameter=\"pid\">Attach to local process</argument>
        <argument name=\"-debug\" parameter=\"executable\">Start and debug executable</argument>
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -25,6 +25,10 @@ QtcPlugin {
        "../../shared/registryaccess"
    ])

+    pluginRecommends: [
+        "CppEditor"
+    ]
+
    Group {
        condition: Defaults.testsEnabled(qbs)
        qbs.install: true
--- a/src/plugins/debugger/debugger_dependencies.pri
+++ b/src/plugins/debugger/debugger_dependencies.pri
@@ -11,3 +11,5 @@ QTC_PLUGIN_DEPENDS += \
    find \
    projectexplorer \
    texteditor
+QTC_PLUGIN_RECOMMENDS += \
+    cppeditor
--- a/src/plugins/designer/Designer.pluginspec.in
+++ b/src/plugins/designer/Designer.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Qt Designer integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-<!-- For compiling with CPP support enabled -->
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/diffeditor/DiffEditor.pluginspec.in
+++ b/src/plugins/diffeditor/DiffEditor.pluginspec.in
@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Diff editor component.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/fakevim/FakeVim.pluginspec.in
+++ b/src/plugins/fakevim/FakeVim.pluginspec.in
@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    </license>
    <description>VI-style keyboard navigation.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/find/Find.pluginspec.in
+++ b/src/plugins/find/Find.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Provides the find widget and the hooks for find implementations.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
+++ b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>Generic support</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/git/Git.pluginspec.in
+++ b/src/plugins/git/Git.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Git integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/glsleditor/GLSLEditor.pluginspec.in
+++ b/src/plugins/glsleditor/GLSLEditor.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>GLSL</category>
    <description>Editor for GLSL.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/helloworld/HelloWorld.pluginspec.in
+++ b/src/plugins/helloworld/HelloWorld.pluginspec.in
@@ -12,7 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    </license>
    <description>Hello World sample plugin.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/helloworld/helloworld_dependencies.pri
+++ b/src/plugins/helloworld/helloworld_dependencies.pri
@@ -4,3 +4,6 @@ QTC_LIB_DEPENDS += \

 QTC_PLUGIN_DEPENDS += \
    coreplugin
+
+QTC_PLUGIN_RECOMMENDS += \
+    # optional plugin dependencies. nothing here at this time
--- a/src/plugins/help/Help.pluginspec.in
+++ b/src/plugins/help/Help.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Help system.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/imageviewer/ImageViewer.pluginspec.in
+++ b/src/plugins/imageviewer/ImageViewer.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Image Viewer component.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/locator/Locator.pluginspec.in
+++ b/src/plugins/locator/Locator.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/macros/Macros.pluginspec.in
+++ b/src/plugins/macros/Macros.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Macros in text editors.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/madde/Madde.pluginspec.in
+++ b/src/plugins/madde/Madde.pluginspec.in
@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <description>Support for MADDE-based platforms, including Fremantle and MeeGo 1.2 Harmattan.</description>
    <category>Device Support</category>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/mercurial/Mercurial.pluginspec.in
+++ b/src/plugins/mercurial/Mercurial.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Mercurial integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/perforce/Perforce.pluginspec.in
+++ b/src/plugins/perforce/Perforce.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Perforce integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
+++ b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
@@ -13,12 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
    <argumentList>
        <argument name=\"-customwizard-verbose\">Verbose loading of custom wizards</argument>
        <argument name=\"-lastsession\">Restore the last session</argument>
--- a/src/plugins/pythoneditor/PythonEditor.pluginspec.in
+++ b/src/plugins/pythoneditor/PythonEditor.pluginspec.in
@@ -13,10 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Python</category>
    <description>Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>

--- a/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
+++ b/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
@@ -13,11 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>QBS support</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qmldesigner/QmlDesigner.pluginspec.in
+++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in
@@ -19,12 +19,5 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
    <category>Qt Quick</category>
    <description>Visual Designer for QML files.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
+++ b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Quick</category>
    <description>Editor for QML and JavaScript.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qmljstools/QmlJSTools.pluginspec.in
+++ b/src/plugins/qmljstools/QmlJSTools.pluginspec.in
@@ -13,12 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Quick</category>
    <description>Tools for analyzing Qml/JS code.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-        <!-- Types and modules exported from C++ will be pulled into the QML code model -->
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
+++ b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
@@ -13,12 +13,5 @@
    <category>Qt Quick</category>
    <description>Qml Profiler Plugin</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
@@ -13,12 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Quick</category>
    <description>Qt Quick support</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\" />
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\" />
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qnx/Qnx.pluginspec.in
+++ b/src/plugins/qnx/Qnx.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <description>Adds support for QNX to Qt Creator</description>
    <category>Device Support</category>
    <url>http://www.rim.com</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
+++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
@@ -13,13 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>Provides project type for Qt 4 pro files and tools.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QmlJSTools\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Designer\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -22,6 +22,10 @@ QtcPlugin {
        "../../shared",
    ])

+    pluginRecommends: [
+        "Designer"
+    ]
+
    files: [
        "Qt4ProjectManager.mimetypes.xml",
        "addlibrarywizard.cpp",
--- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
@@ -7,3 +7,5 @@ QTC_PLUGIN_DEPENDS += \
    cpptools \
    debugger \
    qmljstools
+QTC_PLUGIN_RECOMMENDS += \
+    designer
--- a/src/plugins/qtsupport/QtSupport.pluginspec.in
+++ b/src/plugins/qtsupport/QtSupport.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Build Systems</category>
    <description>Provides support code for build systems.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/remotelinux/RemoteLinux.pluginspec.in
+++ b/src/plugins/remotelinux/RemoteLinux.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <description>Support for deployment to and execution on a remote Linux host.</description>
    <category>Device Support</category>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"QtSupport\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in
+++ b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in
@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Editor for qrc files.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/subversion/Subversion.pluginspec.in
+++ b/src/plugins/subversion/Subversion.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Subversion integration.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"VcsBase\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/tasklist/TaskList.pluginspec.in
+++ b/src/plugins/tasklist/TaskList.pluginspec.in
@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    </license>
    <description>Use .tasks-files to populate the Issues view.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-	<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/texteditor/TextEditor.pluginspec.in
+++ b/src/plugins/texteditor/TextEditor.pluginspec.in
@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Text editor framework and the implementation of the basic text editor.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/todo/Todo.pluginspec.in
+++ b/src/plugins/todo/Todo.pluginspec.in
@@ -12,10 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
  </license>
  <description>Adds pane that lists all TODO, FIXME, etc. entries in comments.</description>
  <url>http://www.qt-project.org</url>
-  <dependencyList>
-    <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-    <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-  </dependencyList>
+  $$dependencyList
 </plugin>
--- a/src/plugins/updateinfo/UpdateInfo.pluginspec.in
+++ b/src/plugins/updateinfo/UpdateInfo.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Displays Update-Infos for Qt Installer Framework-based Updaters.</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/valgrind/Valgrind.pluginspec.in
+++ b/src/plugins/valgrind/Valgrind.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Code Analyzer</category>
    <description>Valgrind Plugin</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/vcsbase/VcsBase.pluginspec.in
+++ b/src/plugins/vcsbase/VcsBase.pluginspec.in
@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Version Control</category>
    <description>Version Control System Base Plugin</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
-        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/plugins/welcome/Welcome.pluginspec.in
+++ b/src/plugins/welcome/Welcome.pluginspec.in
@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
    <category>Qt Creator</category>
    <description>Default Welcome Screen Plugin</description>
    <url>http://www.qt-project.org</url>
-    <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
-    </dependencyList>
+    $$dependencyList
 </plugin>
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -1,6 +1,19 @@
 include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri))
 TARGET = $$QTC_PLUGIN_NAME

+# for substitution in the .pluginspec
+dependencyList = "<dependencyList>"
+for(dep, QTC_PLUGIN_DEPENDS) {
+    include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
+    dependencyList += "        <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>"
+}
+for(dep, QTC_PLUGIN_RECOMMENDS) {
+    include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
+    dependencyList += "        <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>"
+}
+dependencyList += "    </dependencyList>"
+dependencyList = $$join(dependencyList, $$escape_expand(\\n))
+
 include(../qtcreator.pri)

 # use gui precompiled header for plugins by default