diff options
Diffstat (limited to 'src/qtcreatorplugin.pri')
-rw-r--r-- | src/qtcreatorplugin.pri | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index c243fa1180..4877cd1942 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -17,11 +17,29 @@ include(../qtcreator.pri) # for substitution in the .pluginspec dependencyList = "<dependencyList>" for(dep, plugin_deps) { - include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) + dependencies_file = + for(dir, QTC_PLUGIN_DIRS) { + exists($$dir/$$dep/$${dep}_dependencies.pri) { + dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri + break() + } + } + isEmpty(dependencies_file): \ + error("Plugin dependency $$dep not found") + include($$dependencies_file) dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>" } for(dep, plugin_recmds) { - include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) + dependencies_file = + for(dir, QTC_PLUGIN_DIRS) { + exists($$dir/$$dep/$${dep}_dependencies.pri) { + dependencies_file = $$dir/$$dep/$${dep}_dependencies.pri + break() + } + } + isEmpty(dependencies_file): \ + error("Plugin dependency $$dep not found") + include($$dependencies_file) dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>" } dependencyList += " </dependencyList>" |