diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in b/share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in index 9f2d81fe3f9fdc6f73dc42a09796ed15fbab30c4..87fec6f177f116ecb664e2b4f78c80646e288ac2 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 051e7fad490e20d6b8693fd797a9cab63df700d7..14edfde29d8a2e6bc4b3e2fffec21dc50f989b31 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 0000000000000000000000000000000000000000..8b1a4fa24e87d89b2f4741492efaa56819a7ce32 --- /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 f6777c3a4f6e8c319bfbd4fc355e4f5fba804056..c517eba363ec71a0701ec719833831a6ef0cbe77 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"/>