From d715667b206768677c18cd575ccd4f60c41a1091 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 10 Oct 2016 17:59:19 +0200 Subject: normalize name of plugin default linkage overrides QTPLUGIN. is better used with valid variable names, which is not the case when the plugin type contains slashes (plugin subtypes) or dashes (just so). normalize these chars to underscores. Change-Id: Icc93d952b93fef342e2fc93f20e9c5dd010dd734 Reviewed-by: Jake Petroules --- mkspecs/features/qt.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 965b6cefc3..ddf99da303 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -290,7 +290,8 @@ contains(TEMPLATE, .*app) { autoplugs = for (qtmod, qt_module_deps) { for (ptype, QT.$${qtmod}.plugin_types) { - isEmpty(QTPLUGIN.$$ptype) { + nptype = $$replace(ptype, [-/], _) + isEmpty(QTPLUGIN.$$nptype) { for (plug, QT_PLUGINS) { equals(QT_PLUGIN.$${plug}.TYPE, $$ptype) { for (dep, QT_PLUGIN.$${plug}.EXTENDS) { @@ -303,7 +304,7 @@ contains(TEMPLATE, .*app) { } } } else { - plug = $$eval(QTPLUGIN.$$ptype) + plug = $$eval(QTPLUGIN.$$nptype) !equals(plug, -): \ autoplugs += $$plug } -- cgit v1.2.3