diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 03057c7b752..3a6297f7774 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 = [""]; + for (i in plugin_depends) { + deplist.push(" "); + } + for (i in plugin_recommends) { + deplist.push(" "); + } + deplist.push(" "); + 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 139b90794f0..0535da287b0 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 fed5008a89a..8af44ee37e8 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 Code Analyzer Code Analyzer Base Plugin http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/android/Android.pluginspec.in b/src/plugins/android/Android.pluginspec.in index 0f5ddc6e5a2..acd7b6f6c78 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 Support for deployment to and execution on Android Devices Device Support http://necessitas.kde.org - - - - - - + $$dependencyList diff --git a/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in b/src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in index 8d00f182a00..657d0d1ce13 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 Build Systems Autotools project integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/bazaar/Bazaar.pluginspec.in b/src/plugins/bazaar/Bazaar.pluginspec.in index 045e42d8adf..28f7d0f0592 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 Version Control Bazaar integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/bineditor/BinEditor.pluginspec.in b/src/plugins/bineditor/BinEditor.pluginspec.in index 80622f6099e..7af26deb246 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 Qt Creator Binary editor component. http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/bookmarks/Bookmarks.pluginspec.in b/src/plugins/bookmarks/Bookmarks.pluginspec.in index 099c7635a5e..6c659ed1846 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 Qt Creator Bookmarks in text editors. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/classview/ClassView.pluginspec.in b/src/plugins/classview/ClassView.pluginspec.in index c7ac0de4206..3adf67fcaea 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 C++ Class View component. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/clearcase/ClearCase.pluginspec.in b/src/plugins/clearcase/ClearCase.pluginspec.in index f85625da1df..13558fa3da4 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 Version Control ClearCase integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in b/src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in index 8672e431b90..e51e6eebdb6 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 Build Systems CMake support http://www.qt-project.org - - - - - - - + $$dependencyList diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 9fdfdf9df1b..5006c3f7eea 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 002c7509614..7ebfd23a06a 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 ab31c0d8362..0f0a56c30a2 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 Codepaster plugin for pushing/fetching diff from server http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/cppeditor/CppEditor.pluginspec.in b/src/plugins/cppeditor/CppEditor.pluginspec.in index 4a53251b556..8f6e5e10da2 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 C++ C/C++ editor component. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/cpptools/CppTools.pluginspec.in b/src/plugins/cpptools/CppTools.pluginspec.in index 6107ea515c0..d677db481e9 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 C++ Tools for analyzing C/C++ code. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/cvs/CVS.pluginspec.in b/src/plugins/cvs/CVS.pluginspec.in index b38aa48bbe1..cf30f50e60d 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 Version Control CVS integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in index 7b3abf81df9..22d81075696 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 Qt Creator Debugger integration. http://www.qt-project.org - - - - - - - - + $$dependencyList Attach to local process Start and debug executable diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 91c1e3db3ee..ce88d079c30 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 1ca1fcf5511..369a4fc2525 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 f1ccc73a3ee..69dc9b93ade 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 Qt Creator Qt Designer integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/diffeditor/DiffEditor.pluginspec.in b/src/plugins/diffeditor/DiffEditor.pluginspec.in index 0725168ea82..7ca9bb590eb 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 Qt Creator Diff editor component. http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/fakevim/FakeVim.pluginspec.in b/src/plugins/fakevim/FakeVim.pluginspec.in index 5064536d03b..1717e5e680c 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 VI-style keyboard navigation. http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/find/Find.pluginspec.in b/src/plugins/find/Find.pluginspec.in index 22dbd187264..ddce5487877 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 Qt Creator Provides the find widget and the hooks for find implementations. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in b/src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in index bd996e376a2..19e72d595df 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 Build Systems Generic support http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/git/Git.pluginspec.in b/src/plugins/git/Git.pluginspec.in index af63290225e..b5a2c03495d 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 Version Control Git integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/glsleditor/GLSLEditor.pluginspec.in b/src/plugins/glsleditor/GLSLEditor.pluginspec.in index 4aa81f730be..cb29e65f99c 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 GLSL Editor for GLSL. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/helloworld/HelloWorld.pluginspec.in b/src/plugins/helloworld/HelloWorld.pluginspec.in index c5703808427..17e14e8481e 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 Hello World sample plugin. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/helloworld/helloworld_dependencies.pri b/src/plugins/helloworld/helloworld_dependencies.pri index 014c78108b2..bdf7d508841 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 9ba5de03e3a..393f331341e 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 Qt Creator Help system. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/imageviewer/ImageViewer.pluginspec.in b/src/plugins/imageviewer/ImageViewer.pluginspec.in index 3982f95728d..c22fe56a3f4 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 Qt Creator Image Viewer component. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/locator/Locator.pluginspec.in b/src/plugins/locator/Locator.pluginspec.in index 1f9cc498b47..c9af5b827e4 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 Qt Creator Provides the Locator widget and the hooks for Locator filter implementations. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/macros/Macros.pluginspec.in b/src/plugins/macros/Macros.pluginspec.in index 80e5415b16d..7ed581c5d7e 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 Qt Creator Macros in text editors. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/madde/Madde.pluginspec.in b/src/plugins/madde/Madde.pluginspec.in index f0803a8b957..53485f089fe 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 Support for MADDE-based platforms, including Fremantle and MeeGo 1.2 Harmattan. Device Support http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/mercurial/Mercurial.pluginspec.in b/src/plugins/mercurial/Mercurial.pluginspec.in index 26e1813deab..3a034c05f15 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 Version Control Mercurial integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/perforce/Perforce.pluginspec.in b/src/plugins/perforce/Perforce.pluginspec.in index f2bb0c619c1..415b1b068d0 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 Version Control Perforce integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in b/src/plugins/projectexplorer/ProjectExplorer.pluginspec.in index 39a6a79297b..588fe9865d8 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 Qt Creator ProjectExplorer framework that can be extended with different kind of project types. http://www.qt-project.org - - - - - - + $$dependencyList Verbose loading of custom wizards Restore the last session diff --git a/src/plugins/pythoneditor/PythonEditor.pluginspec.in b/src/plugins/pythoneditor/PythonEditor.pluginspec.in index a8cc126001f..0b1f5b065b9 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 Python Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in b/src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in index d9ef42b049d..e776d3e0f6e 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 Build Systems QBS support http://www.qt-project.org - - - - - - - + $$dependencyList diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec.in b/src/plugins/qmldesigner/QmlDesigner.pluginspec.in index 824823d2601..693fd5f8141 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. Qt Quick Visual Designer for QML files. http://www.qt-project.org - - - - - - - - + $$dependencyList diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in b/src/plugins/qmljseditor/QmlJSEditor.pluginspec.in index 3754577d71d..991ba2cdb8b 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 Qt Quick Editor for QML and JavaScript. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/qmljstools/QmlJSTools.pluginspec.in b/src/plugins/qmljstools/QmlJSTools.pluginspec.in index 10815ac2426..668476ff072 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 Qt Quick Tools for analyzing Qml/JS code. http://www.qt-project.org - - - - - - - - + $$dependencyList diff --git a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in index 19fc666230d..65dc165b7f2 100644 --- a/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in +++ b/src/plugins/qmlprofiler/QmlProfiler.pluginspec.in @@ -13,12 +13,5 @@ Qt Quick Qml Profiler Plugin http://www.qt-project.org - - - - - - - - + $$dependencyList diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in index 004d66da4db..f53fcb55a67 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 Qt Quick Qt Quick support http://www.qt-project.org - - - - - - - - + $$dependencyList diff --git a/src/plugins/qnx/Qnx.pluginspec.in b/src/plugins/qnx/Qnx.pluginspec.in index aef4606b33d..a5b87508801 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 Adds support for QNX to Qt Creator Device Support http://www.rim.com - - - - - + $$dependencyList diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in b/src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in index 0f993dde8c3..74fd5623d63 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 Build Systems Provides project type for Qt 4 pro files and tools. http://www.qt-project.org - - - - - - - - - + $$dependencyList diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs index 3f214bfbdaa..2e03a379472 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 dcaa491ca8c..b72e6d0181c 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 edce2f8897a..42db1d4a2f5 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 Build Systems Provides support code for build systems. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/remotelinux/RemoteLinux.pluginspec.in b/src/plugins/remotelinux/RemoteLinux.pluginspec.in index 6f9bdfe2085..aa084bc08c6 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 Support for deployment to and execution on a remote Linux host. Device Support http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/resourceeditor/ResourceEditor.pluginspec.in b/src/plugins/resourceeditor/ResourceEditor.pluginspec.in index f2cb4d42a6a..5a88cc126df 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 Qt Creator Editor for qrc files. http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/subversion/Subversion.pluginspec.in b/src/plugins/subversion/Subversion.pluginspec.in index 95b9f75b89a..b9dfeaaeb3e 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 Version Control Subversion integration. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/tasklist/TaskList.pluginspec.in b/src/plugins/tasklist/TaskList.pluginspec.in index 2a2b3dc608d..be61e89a96c 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 Use .tasks-files to populate the Issues view. http://www.qt-project.org - - - - + $$dependencyList diff --git a/src/plugins/texteditor/TextEditor.pluginspec.in b/src/plugins/texteditor/TextEditor.pluginspec.in index 9be8af834de..3868c8eb467 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 Qt Creator Text editor framework and the implementation of the basic text editor. http://www.qt-project.org - - - - - + $$dependencyList diff --git a/src/plugins/todo/Todo.pluginspec.in b/src/plugins/todo/Todo.pluginspec.in index 2065207cd67..c53f32262b5 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 Adds pane that lists all TODO, FIXME, etc. entries in comments. http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/updateinfo/UpdateInfo.pluginspec.in b/src/plugins/updateinfo/UpdateInfo.pluginspec.in index a8e846afb84..1046fc92ff8 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 Qt Creator Displays Update-Infos for Qt Installer Framework-based Updaters. http://www.qt-project.org - - - + $$dependencyList diff --git a/src/plugins/valgrind/Valgrind.pluginspec.in b/src/plugins/valgrind/Valgrind.pluginspec.in index 3147857da83..5d2ebda21d8 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 Code Analyzer Valgrind Plugin http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/vcsbase/VcsBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in index faf839a4686..33a440d2384 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 Version Control Version Control System Base Plugin http://www.qt-project.org - - - - - - + $$dependencyList diff --git a/src/plugins/welcome/Welcome.pluginspec.in b/src/plugins/welcome/Welcome.pluginspec.in index eb01a0827ad..cb2a0489aec 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 Qt Creator Default Welcome Screen Plugin http://www.qt-project.org - - - + $$dependencyList diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 4f2c1b00198..ca1c0aa844d 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 = "" +for(dep, QTC_PLUGIN_DEPENDS) { + include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) + dependencyList += " " +} +for(dep, QTC_PLUGIN_RECOMMENDS) { + include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) + dependencyList += " " +} +dependencyList += " " +dependencyList = $$join(dependencyList, $$escape_expand(\\n)) + include(../qtcreator.pri) # use gui precompiled header for plugins by default