diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-26 16:58:50 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 12:52:03 +0200 |
| commit | f9f8cd354bae8e1767de2899ef5b66d50c4399d3 (patch) | |
| tree | 9673d818466f78a42322451a27342ea929ba3252 | |
| parent | 740d177a044c425b2711673d8c84ab20a7dfdf0a (diff) | |
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>
60 files changed, 106 insertions, 273 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 03057c7b75..3a6297f777 100644 --- 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]); } diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs index 139b90794f..0535da287b 100644 --- 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) { diff --git a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in index fed5008a89..8af44ee37e 100644 --- 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> diff --git a/src/plugins/android/Android.pluginspec.in b/src/plugins/android/Android.pluginspec.in index 0f5ddc6e5a..acd7b6f6c7 100644 --- 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> diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in index 8d00f182a0..657d0d1ce1 100644 --- 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> diff --git a/src/plugins/bazaar/Bazaar.pluginspec.in b/src/plugins/bazaar/Bazaar.pluginspec.in index 045e42d8ad..28f7d0f059 100644 --- 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> diff --git a/src/plugins/bineditor/BinEditor.pluginspec.in b/src/plugins/bineditor/BinEditor.pluginspec.in index 80622f6099..7af26deb24 100644 --- 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> diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec.in b/src/plugins/bookmarks/Bookmarks.pluginspec.in index 099c7635a5..6c659ed184 100644 --- 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> diff --git a/src/plugins/classview/ClassView.pluginspec.in b/src/plugins/classview/ClassView.pluginspec.in index c7ac0de420..3adf67fcae 100644 --- 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> diff --git a/src/plugins/clearcase/ClearCase.pluginspec.in b/src/plugins/clearcase/ClearCase.pluginspec.in index f85625da1d..13558fa3da 100644 --- 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> diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in index 8672e431b9..e51e6eebdb 100644 --- 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> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 9fdfdf9df1..5006c3f7ee 100644 --- 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", diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri index 002c750961..7ebfd23a06 100644 --- 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 diff --git a/src/plugins/cpaster/CodePaster.pluginspec.in b/src/plugins/cpaster/CodePaster.pluginspec.in index ab31c0d836..0f0a56c30a 100644 --- 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> diff --git a/src/plugins/cppeditor/CppEditor.pluginspec.in b/src/plugins/cppeditor/CppEditor.pluginspec.in index 4a53251b55..8f6e5e10da 100644 --- 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> diff --git a/src/plugins/cpptools/CppTools.pluginspec.in b/src/plugins/cpptools/CppTools.pluginspec.in index 6107ea515c..d677db481e 100644 --- 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> diff --git a/src/plugins/cvs/CVS.pluginspec.in b/src/plugins/cvs/CVS.pluginspec.in index b38aa48bbe..cf30f50e60 100644 --- 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> diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in index 7b3abf81df..22d8107569 100644 --- 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> diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 91c1e3db3e..ce88d079c3 100644 --- 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 diff --git a/src/plugins/debugger/debugger_dependencies.pri b/src/plugins/debugger/debugger_dependencies.pri index 1ca1fcf551..369a4fc252 100644 --- 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 diff --git a/src/plugins/designer/Designer.pluginspec.in b/src/plugins/designer/Designer.pluginspec.in index f1ccc73a3e..69dc9b93ad 100644 --- 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> diff --git a/src/plugins/diffeditor/DiffEditor.pluginspec.in b/src/plugins/diffeditor/DiffEditor.pluginspec.in index 0725168ea8..7ca9bb590e 100644 --- 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> diff --git a/src/plugins/fakevim/FakeVim.pluginspec.in b/src/plugins/fakevim/FakeVim.pluginspec.in index 5064536d03..1717e5e680 100644 --- 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> diff --git a/src/plugins/find/Find.pluginspec.in b/src/plugins/find/Find.pluginspec.in index 22dbd18726..ddce548787 100644 --- 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> diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in index bd996e376a..19e72d595d 100644 --- 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> diff --git a/src/plugins/git/Git.pluginspec.in b/src/plugins/git/Git.pluginspec.in index af63290225..b5a2c03495 100644 --- 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> diff --git a/src/plugins/glsleditor/GLSLEditor.pluginspec.in b/src/plugins/glsleditor/GLSLEditor.pluginspec.in index 4aa81f730b..cb29e65f99 100644 --- 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> diff --git a/src/plugins/helloworld/HelloWorld.pluginspec.in b/src/plugins/helloworld/HelloWorld.pluginspec.in index c570380842..17e14e8481 100644 --- 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> diff --git a/src/plugins/helloworld/helloworld_dependencies.pri b/src/plugins/helloworld/helloworld_dependencies.pri index 014c78108b..bdf7d50884 100644 --- 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 diff --git a/src/plugins/help/Help.pluginspec.in b/src/plugins/help/Help.pluginspec.in index 9ba5de03e3..393f331341 100644 --- 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> diff --git a/src/plugins/imageviewer/ImageViewer.pluginspec.in b/src/plugins/imageviewer/ImageViewer.pluginspec.in index 3982f95728..c22fe56a3f 100644 --- 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> diff --git a/src/plugins/locator/Locator.pluginspec.in b/src/plugins/locator/Locator.pluginspec.in index 1f9cc498b4..c9af5b827e 100644 --- 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> diff --git a/src/plugins/macros/Macros.pluginspec.in b/src/plugins/macros/Macros.pluginspec.in index 80e5415b16..7ed581c5d7 100644 --- 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> diff --git a/src/plugins/madde/Madde.pluginspec.in b/src/plugins/madde/Madde.pluginspec.in index f0803a8b95..53485f089f 100644 --- 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> diff --git a/src/plugins/mercurial/Mercurial.pluginspec.in b/src/plugins/mercurial/Mercurial.pluginspec.in index 26e1813dea..3a034c05f1 100644 --- 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> diff --git a/src/plugins/perforce/Perforce.pluginspec.in b/src/plugins/perforce/Perforce.pluginspec.in index f2bb0c619c..415b1b068d 100644 --- 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> diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in index 39a6a79297..588fe9865d 100644 --- 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> diff --git a/src/plugins/pythoneditor/PythonEditor.pluginspec.in b/src/plugins/pythoneditor/PythonEditor.pluginspec.in index a8cc126001..0b1f5b065b 100644 --- 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> diff --git a/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in b/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in index d9ef42b049..e776d3e0f6 100644 --- 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> diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec.in b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in index 824823d260..693fd5f814 100644 --- 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> diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in index 3754577d71..991ba2cdb8 100644 --- 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> diff --git a/src/plugins/qmljstools/QmlJSTools.pluginspec.in b/src/plugins/qmljstools/QmlJSTools.pluginspec.in index 10815ac242..668476ff07 100644 --- 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> diff --git a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in index 19fc666230..65dc165b7f 100644 --- 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> diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in index 004d66da4d..f53fcb55a6 100644 --- 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> diff --git a/src/plugins/qnx/Qnx.pluginspec.in b/src/plugins/qnx/Qnx.pluginspec.in index aef4606b33..a5b8750880 100644 --- 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> diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in index 0f993dde8c..74fd5623d6 100644 --- 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> diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs index 3f214bfbda..2e03a37947 100644 --- 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", diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri index dcaa491ca8..b72e6d0181 100644 --- 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 diff --git a/src/plugins/qtsupport/QtSupport.pluginspec.in b/src/plugins/qtsupport/QtSupport.pluginspec.in index edce2f8897..42db1d4a2f 100644 --- 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> diff --git a/src/plugins/remotelinux/RemoteLinux.pluginspec.in b/src/plugins/remotelinux/RemoteLinux.pluginspec.in index 6f9bdfe208..aa084bc08c 100644 --- 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> diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in index f2cb4d42a6..5a88cc126d 100644 --- 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> diff --git a/src/plugins/subversion/Subversion.pluginspec.in b/src/plugins/subversion/Subversion.pluginspec.in index 95b9f75b89..b9dfeaaeb3 100644 --- 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> diff --git a/src/plugins/tasklist/TaskList.pluginspec.in b/src/plugins/tasklist/TaskList.pluginspec.in index 2a2b3dc608..be61e89a96 100644 --- 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> diff --git a/src/plugins/texteditor/TextEditor.pluginspec.in b/src/plugins/texteditor/TextEditor.pluginspec.in index 9be8af834d..3868c8eb46 100644 --- 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> diff --git a/src/plugins/todo/Todo.pluginspec.in b/src/plugins/todo/Todo.pluginspec.in index 2065207cd6..c53f32262b 100644 --- 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> diff --git a/src/plugins/updateinfo/UpdateInfo.pluginspec.in b/src/plugins/updateinfo/UpdateInfo.pluginspec.in index a8e846afb8..1046fc92ff 100644 --- 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> diff --git a/src/plugins/valgrind/Valgrind.pluginspec.in b/src/plugins/valgrind/Valgrind.pluginspec.in index 3147857da8..5d2ebda21d 100644 --- 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> diff --git a/src/plugins/vcsbase/VcsBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in index faf839a468..33a440d238 100644 --- 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> diff --git a/src/plugins/welcome/Welcome.pluginspec.in b/src/plugins/welcome/Welcome.pluginspec.in index eb01a0827a..cb2a0489ae 100644 --- 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> diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 4f2c1b0019..ca1c0aa844 100644 --- 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 |