diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-28 09:52:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-28 10:09:50 +0200 |
| commit | 314126cc7593d7469ccfa4b6a9c7bee9eaafb5d8 (patch) | |
| tree | 3d9f2f255353554ec7a29500889831c6e8246f17 /src/qtcreatorplugin.pri | |
| parent | e9f901be150fa8acd177cd59fe6346c72f6d92e4 (diff) | |
fix auto-generated version info in .pluginspec files
we need to include qtcreator.pri before calculating $$dependencyList, as
that's where the version comes from.
this also has the side effect that the "real" dependency resolution in
qtcreator.pri gets "clean" input - not that it would actually matter.
Change-Id: Ibb91c569c8e05b0e45214e7e84aee8ff3316bf5d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index ca1c0aa844..c12c7c417a 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -1,21 +1,24 @@ include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) TARGET = $$QTC_PLUGIN_NAME +plugin_deps = $$QTC_PLUGIN_DEPENDS +plugin_recmds = $$QTC_PLUGIN_RECOMMENDS + +include(../qtcreator.pri) + # for substitution in the .pluginspec dependencyList = "<dependencyList>" -for(dep, QTC_PLUGIN_DEPENDS) { +for(dep, plugin_deps) { include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>" } -for(dep, QTC_PLUGIN_RECOMMENDS) { +for(dep, plugin_recmds) { include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>" } dependencyList += " </dependencyList>" dependencyList = $$join(dependencyList, $$escape_expand(\\n)) -include(../qtcreator.pri) - # use gui precompiled header for plugins by default isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h |