Commit 314126cc authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

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's avatarOrgad Shaneh <orgads@gmail.com>
parent e9f901be
include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)) include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri))
TARGET = $$QTC_PLUGIN_NAME TARGET = $$QTC_PLUGIN_NAME
plugin_deps = $$QTC_PLUGIN_DEPENDS
plugin_recmds = $$QTC_PLUGIN_RECOMMENDS
include(../qtcreator.pri)
# for substitution in the .pluginspec # for substitution in the .pluginspec
dependencyList = "<dependencyList>" dependencyList = "<dependencyList>"
for(dep, QTC_PLUGIN_DEPENDS) { for(dep, plugin_deps) {
include($$PWD/plugins/$$dep/$${dep}_dependencies.pri) include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\"/>" 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) include($$PWD/plugins/$$dep/$${dep}_dependencies.pri)
dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>" dependencyList += " <dependency name=\"$$QTC_PLUGIN_NAME\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>"
} }
dependencyList += " </dependencyList>" dependencyList += " </dependencyList>"
dependencyList = $$join(dependencyList, $$escape_expand(\\n)) dependencyList = $$join(dependencyList, $$escape_expand(\\n))
include(../qtcreator.pri)
# use gui precompiled header for plugins by default # use gui precompiled header for plugins by default
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment