diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
| commit | b03a981a411a7b93b5280d4e42faa8357854e638 (patch) | |
| tree | f91fb763dde57b15634673c4d58bd32f8999a886 /src/qtcreatorplugin.pri | |
| parent | 1f0665a3e2f0f33b43a492afac54d7300d65378f (diff) | |
| parent | cdc2a0f72334268684e0407e9b04b3188e00d4bf (diff) | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
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 21dc0d78ce..b90b9b9b83 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>" |