From 0d5c886af3f99f37b7c024275516442659d74a9d Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 18 Apr 2013 20:17:50 +0200
Subject: [PATCH] Adapt the Qt Creator plugin project template to recent
changes
Change-Id: Id5cc8642547a3698d2e11b956f0c1cfe3e8bea1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
.../wizards/qtcreatorplugin/MyPlugin.pluginspec.in | 4 +---
.../templates/wizards/qtcreatorplugin/myplugin.pro | 6 ------
.../wizards/qtcreatorplugin/myplugin_dependencies.pri | 9 +++++++++
.../templates/wizards/qtcreatorplugin/wizard.xml | 1 +
4 files changed, 11 insertions(+), 9 deletions(-)
create mode 100644 share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in
index 9f2d81fe3f9..87fec6f177f 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in
@@ -4,7 +4,5 @@
<license>%License%</license>
<description>%Description%</description>
<url>%URL%</url>
- <dependencyList>
- <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- </dependencyList>
+ $$dependencyList
</plugin>
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
index 051e7fad490..14edfde29d8 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
@@ -1,6 +1,3 @@
-TARGET = %PluginName%
-TEMPLATE = lib
-
DEFINES += %PluginName:u%_LIBRARY
# %PluginName% files
@@ -32,6 +29,3 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
PROVIDER = %VendorName%
include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
-include($$QTCREATOR_SOURCES/src/plugins/coreplugin/coreplugin.pri)
-
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
new file mode 100644
index 00000000000..8b1a4fa24e8
--- /dev/null
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
@@ -0,0 +1,9 @@
+QTC_PLUGIN_NAME = %PluginName%
+QTC_LIB_DEPENDS += \
+ # nothing here at this time
+
+QTC_PLUGIN_DEPENDS += \
+ coreplugin
+
+QTC_PLUGIN_RECOMMENDS += \
+ # optional plugin dependencies. nothing here at this time
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
index f6777c3a4f6..c517eba363e 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
@@ -44,6 +44,7 @@ leave room for the Qt 4 target page.
<displaycategory>Libraries</displaycategory>
<files>
<file source="myplugin.pro" target="%PluginName:l%.pro" openproject="true"/>
+ <file source="myplugin_dependencies.pri" target="%PluginName:l%_dependencies.pri" openeditor="true"/>
<file source="MyPlugin.pluginspec.in" target="%PluginName%.pluginspec.in" openeditor="true"/>
<file source="myplugin_global.h" target="%PluginName:l%_global.%CppHeaderSuffix%" openeditor="true"/>
<file source="mypluginconstants.h" target="%PluginName:l%constants.%CppHeaderSuffix%" openeditor="true"/>
--
GitLab