From 2f936968e7f4569959ba749d090235ea5d2830a7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 2 Oct 2013 12:53:07 +0200
Subject: [PATCH] make the plugin template not create a _dependencies.pri file
it's pointless and counterproductive for 3rd party plugins.
Task-number: QTCREATORBUG-9192
Change-Id: Id9a59e44fa37d00ff5bd68b4240517f0d014c7a2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
.../wizards/qtcreatorplugin/myplugin.pro | 16 ++++++++++++++++
.../qtcreatorplugin/myplugin_dependencies.pri | 9 ---------
.../templates/wizards/qtcreatorplugin/wizard.xml | 1 -
3 files changed, 16 insertions(+), 10 deletions(-)
delete mode 100644 share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
index 14edfde29d8..8663c6f02c7 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
@@ -28,4 +28,20 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
PROVIDER = %VendorName%
+###### If the plugin can be depended upon by other plugins, this code needs to be outsourced to
+###### <dirname>_dependencies.pri, where <dirname> is the name of the directory containing the
+###### plugin's sources.
+
+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
+
+###### End _dependencies.pri contents ######
+
include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
deleted file mode 100644
index 8b1a4fa24e8..00000000000
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_dependencies.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-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 c517eba363e..f6777c3a4f6 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
@@ -44,7 +44,6 @@ 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