feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

auto-generate <dependencyList> in .pluginspec files

Browse Source 
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-03-26 16:58:50 +01:00
parent 740d177a04
commit f9f8cd354b
60 changed files with 106 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
qbs/pluginspec/pluginspec.qbs
View File

@@ -29,6 +29,18 @@ Module {
cmd.ide_version_release = product.moduleProperty("pluginspec", "ide_version_release"); cmd.ide_version_release = product.moduleProperty("pluginspec", "ide_version_release");
cmd.pluginspecreplacements = product.moduleProperty("pluginspec", "pluginspecreplacements"); 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() { cmd.sourceCode = function() {
var i; var i;
@@ -42,6 +54,15 @@ Module {
vars['IDE_VERSION_MAJOR'] = ide_version_major; vars['IDE_VERSION_MAJOR'] = ide_version_major;
vars['IDE_VERSION_MINOR'] = ide_version_minor; vars['IDE_VERSION_MINOR'] = ide_version_minor;
vars['IDE_VERSION_RELEASE'] = ide_version_release; 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) { for (i in vars) {
all = all.replace(new RegExp('\\\$\\\$' + i + '(?!\w)', 'g'), vars[i]); all = all.replace(new RegExp('\\\$\\\$' + i + '(?!\w)', 'g'), vars[i]);
} }

1
src/plugins/QtcPlugin.qbs
View File

@@ -6,6 +6,7 @@ Product {
type: ["dynamiclibrary", "pluginSpec"] type: ["dynamiclibrary", "pluginSpec"]
property string provider: 'QtProject' property string provider: 'QtProject'
property var pluginspecreplacements property var pluginspecreplacements
property var pluginRecommends: []
targetName: { targetName: {
// see PluginSpecPrivate::loadLibrary() // see PluginSpecPrivate::loadLibrary()
if (qbs.debugInformation) { if (qbs.debugInformation) {

7
src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Code Analyzer</category> <category>Code Analyzer</category>
<description>Code Analyzer Base Plugin</description> <description>Code Analyzer Base Plugin</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/android/Android.pluginspec.in
View File

@@ -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> <description>Support for deployment to and execution on Android Devices</description>
<category>Device Support</category> <category>Device Support</category>
<url>http://necessitas.kde.org</url> <url>http://necessitas.kde.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>Autotools project integration.</description> <description>Autotools project integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/bazaar/Bazaar.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Bazaar integration.</description> <description>Bazaar integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

5
src/plugins/bineditor/BinEditor.pluginspec.in
View File

@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Binary editor component.</description> <description>Binary editor component.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

6
src/plugins/bookmarks/Bookmarks.pluginspec.in
View File

@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Bookmarks in text editors.</description> <description>Bookmarks in text editors.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/classview/ClassView.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>C++</category> <category>C++</category>
<description>Class View component.</description> <description>Class View component.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/clearcase/ClearCase.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>ClearCase integration.</description> <description>ClearCase integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

8
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
View File

@@ -13,11 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>CMake support</description> <description>CMake support</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
View File

@@ -14,6 +14,10 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "QtSupport" } Depends { name: "QtSupport" }
pluginRecommends: [
"Designer"
]
files: [ files: [
"CMakeProject.mimetypes.xml", "CMakeProject.mimetypes.xml",
"cmakebuildconfiguration.cpp", "cmakebuildconfiguration.cpp",

2
src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
View File

@@ -4,3 +4,5 @@ QTC_PLUGIN_DEPENDS += \
cpptools \ cpptools \
texteditor \ texteditor \
qtsupport qtsupport
QTC_PLUGIN_RECOMMENDS += \
designer

5
src/plugins/cpaster/CodePaster.pluginspec.in
View File

@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license> </license>
<description>Codepaster plugin for pushing/fetching diff from server</description> <description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

6
src/plugins/cppeditor/CppEditor.pluginspec.in
View File

@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>C++</category> <category>C++</category>
<description>C/C++ editor component.</description> <description>C/C++ editor component.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/cpptools/CppTools.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>C++</category> <category>C++</category>
<description>Tools for analyzing C/C++ code.</description> <description>Tools for analyzing C/C++ code.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/cvs/CVS.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>CVS integration.</description> <description>CVS integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

9
src/plugins/debugger/Debugger.pluginspec.in
View File

@@ -13,14 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Debugger integration.</description> <description>Debugger integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
<argumentList> <argumentList>
<argument name=\"-debug\" parameter=\"pid\">Attach to local process</argument> <argument name=\"-debug\" parameter=\"pid\">Attach to local process</argument>
<argument name=\"-debug\" parameter=\"executable\">Start and debug executable</argument> <argument name=\"-debug\" parameter=\"executable\">Start and debug executable</argument>

4
src/plugins/debugger/debugger.qbs
View File

@@ -25,6 +25,10 @@ QtcPlugin {
"../../shared/registryaccess" "../../shared/registryaccess"
]) ])
pluginRecommends: [
"CppEditor"
]
Group { Group {
condition: Defaults.testsEnabled(qbs) condition: Defaults.testsEnabled(qbs)
qbs.install: true qbs.install: true

2
src/plugins/debugger/debugger_dependencies.pri
View File

@@ -11,3 +11,5 @@ QTC_PLUGIN_DEPENDS += \
find \ find \
projectexplorer \ projectexplorer \
texteditor texteditor
QTC_PLUGIN_RECOMMENDS += \
cppeditor

7
src/plugins/designer/Designer.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Qt Designer integration.</description> <description>Qt Designer integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

5
src/plugins/diffeditor/DiffEditor.pluginspec.in
View File

@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Diff editor component.</description> <description>Diff editor component.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

5
src/plugins/fakevim/FakeVim.pluginspec.in
View File

@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license> </license>
<description>VI-style keyboard navigation.</description> <description>VI-style keyboard navigation.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

4
src/plugins/find/Find.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Provides the find widget and the hooks for find implementations.</description> <description>Provides the find widget and the hooks for find implementations.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>Generic support</description> <description>Generic support</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/git/Git.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Git integration.</description> <description>Git integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

6
src/plugins/glsleditor/GLSLEditor.pluginspec.in
View File

@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>GLSL</category> <category>GLSL</category>
<description>Editor for GLSL.</description> <description>Editor for GLSL.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

4
src/plugins/helloworld/HelloWorld.pluginspec.in
View File

@@ -12,7 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license> </license>
<description>Hello World sample plugin.</description> <description>Hello World sample plugin.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

3
src/plugins/helloworld/helloworld_dependencies.pri
View File

@@ -4,3 +4,6 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \ QTC_PLUGIN_DEPENDS += \
coreplugin coreplugin
QTC_PLUGIN_RECOMMENDS += \
# optional plugin dependencies. nothing here at this time

6
src/plugins/help/Help.pluginspec.in
View File

@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Help system.</description> <description>Help system.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

4
src/plugins/imageviewer/ImageViewer.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Image Viewer component.</description> <description>Image Viewer component.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

4
src/plugins/locator/Locator.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Provides the Locator widget and the hooks for Locator filter implementations.</description> <description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/macros/Macros.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Macros in text editors.</description> <description>Macros in text editors.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

5
src/plugins/madde/Madde.pluginspec.in
View File

@@ -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> <description>Support for MADDE-based platforms, including Fremantle and MeeGo 1.2 Harmattan.</description>
<category>Device Support</category> <category>Device Support</category>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/mercurial/Mercurial.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Mercurial integration.</description> <description>Mercurial integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/perforce/Perforce.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Perforce integration.</description> <description>Perforce integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
View File

@@ -13,12 +13,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>ProjectExplorer framework that can be extended with different kind of project types.</description> <description>ProjectExplorer framework that can be extended with different kind of project types.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
<argumentList> <argumentList>
<argument name=\"-customwizard-verbose\">Verbose loading of custom wizards</argument> <argument name=\"-customwizard-verbose\">Verbose loading of custom wizards</argument>
<argument name=\"-lastsession\">Restore the last session</argument> <argument name=\"-lastsession\">Restore the last session</argument>

6
src/plugins/pythoneditor/PythonEditor.pluginspec.in
View File

@@ -13,10 +13,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Python</category> <category>Python</category>
<description>Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.</description> <description>Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

8
src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
View File

@@ -13,11 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>QBS support</description> <description>QBS support</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

9
src/plugins/qmldesigner/QmlDesigner.pluginspec.in
View File

@@ -19,12 +19,5 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<category>Qt Quick</category> <category>Qt Quick</category>
<description>Visual Designer for QML files.</description> <description>Visual Designer for QML files.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Quick</category> <category>Qt Quick</category>
<description>Editor for QML and JavaScript.</description> <description>Editor for QML and JavaScript.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

9
src/plugins/qmljstools/QmlJSTools.pluginspec.in
View File

@@ -13,12 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Quick</category> <category>Qt Quick</category>
<description>Tools for analyzing Qml/JS code.</description> <description>Tools for analyzing Qml/JS code.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

9
src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
View File

@@ -13,12 +13,5 @@
<category>Qt Quick</category> <category>Qt Quick</category>
<description>Qml Profiler Plugin</description> <description>Qml Profiler Plugin</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

9
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
View File

@@ -13,12 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Quick</category> <category>Qt Quick</category>
<description>Qt Quick support</description> <description>Qt Quick support</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

6
src/plugins/qnx/Qnx.pluginspec.in
View File

@@ -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> <description>Adds support for QNX to Qt Creator</description>
<category>Device Support</category> <category>Device Support</category>
<url>http://www.rim.com</url> <url>http://www.rim.com</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

10
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
View File

@@ -13,13 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>Provides project type for Qt 4 pro files and tools.</description> <description>Provides project type for Qt 4 pro files and tools.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

4
src/plugins/qt4projectmanager/qt4projectmanager.qbs
View File

@@ -22,6 +22,10 @@ QtcPlugin {
"../../shared", "../../shared",
]) ])
pluginRecommends: [
"Designer"
]
files: [ files: [
"Qt4ProjectManager.mimetypes.xml", "Qt4ProjectManager.mimetypes.xml",
"addlibrarywizard.cpp", "addlibrarywizard.cpp",

2
src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
View File

@@ -7,3 +7,5 @@ QTC_PLUGIN_DEPENDS += \
cpptools \ cpptools \
debugger \ debugger \
qmljstools qmljstools
QTC_PLUGIN_RECOMMENDS += \
designer

4
src/plugins/qtsupport/QtSupport.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Build Systems</category> <category>Build Systems</category>
<description>Provides support code for build systems.</description> <description>Provides support code for build systems.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/remotelinux/RemoteLinux.pluginspec.in
View File

@@ -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> <description>Support for deployment to and execution on a remote Linux host.</description>
<category>Device Support</category> <category>Device Support</category>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

5
src/plugins/resourceeditor/ResourceEditor.pluginspec.in
View File

@@ -13,8 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Editor for qrc files.</description> <description>Editor for qrc files.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/subversion/Subversion.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Subversion integration.</description> <description>Subversion integration.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

5
src/plugins/tasklist/TaskList.pluginspec.in
View File

@@ -12,8 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license> </license>
<description>Use .tasks-files to populate the Issues view.</description> <description>Use .tasks-files to populate the Issues view.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

6
src/plugins/texteditor/TextEditor.pluginspec.in
View File

@@ -13,9 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Text editor framework and the implementation of the basic text editor.</description> <description>Text editor framework and the implementation of the basic text editor.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
<dependency name=\"Locator\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/todo/Todo.pluginspec.in
View File

@@ -12,10 +12,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
</license> </license>
<description>Adds pane that lists all TODO, FIXME, etc. entries in comments.</description> <description>Adds pane that lists all TODO, FIXME, etc. entries in comments.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

4
src/plugins/updateinfo/UpdateInfo.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Displays Update-Infos for Qt Installer Framework-based Updaters.</description> <description>Displays Update-Infos for Qt Installer Framework-based Updaters.</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

7
src/plugins/valgrind/Valgrind.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Code Analyzer</category> <category>Code Analyzer</category>
<description>Valgrind Plugin</description> <description>Valgrind Plugin</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

7
src/plugins/vcsbase/VcsBase.pluginspec.in
View File

@@ -13,10 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Version Control</category> <category>Version Control</category>
<description>Version Control System Base Plugin</description> <description>Version Control System Base Plugin</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$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>
</plugin> </plugin>

4
src/plugins/welcome/Welcome.pluginspec.in
View File

@@ -13,7 +13,5 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<category>Qt Creator</category> <category>Qt Creator</category>
<description>Default Welcome Screen Plugin</description> <description>Default Welcome Screen Plugin</description>
<url>http://www.qt-project.org</url> <url>http://www.qt-project.org</url>
<dependencyList> $$dependencyList
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
</dependencyList>
</plugin> </plugin>

13
src/qtcreatorplugin.pri
View File

@@ -1,6 +1,19 @@
include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri))
TARGET = $$QTC_PLUGIN_NAME 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) include(../qtcreator.pri)
# use gui precompiled header for plugins by default # use gui precompiled header for plugins by default