Fix module pri file name for static plugins
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Fri, 7 Dec 2012 09:46:43 +0000 (11:46 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 7 Dec 2012 18:55:13 +0000 (19:55 +0100)
Since QTPLUGIN variable values are used to locate both the plugin
library and the module pri file, those must match. Therefore generate
module pri file name using the TARGET of the plugin rather than the
pro file name.

Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
mkspecs/features/qt_plugin.prf

index b84fa47..e09e5d0 100644 (file)
@@ -21,7 +21,7 @@ contains(QT_CONFIG, static):CONFIG += static
 else:CONFIG += shared
 
 !build_pass:static {
-    isEmpty(MODULE): MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
+    isEmpty(MODULE): MODULE = $$basename(TARGET)
 
     MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri