summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2018-06-11 13:48:43 +0200
committerLiang Qi <liang.qi@qt.io>2018-06-11 14:52:12 +0000
commit8cc27590bd2a04ce841cdb66f234ff13f11148af (patch)
tree6c2bdc4400de23f36b0c312b4bba0692d81f46e7 /mkspecs
parent5b2d33db7c1e6db8f6b7021b9f7c8594880c7003 (diff)
Make sure MODULE is set even when we are not creating a pri file
wayland-scanner.prf uses it as a trigger, so this is needed to make dynamic non-prefix builds work. amends 427e5d61b7. Task-number: QTBUG-68773 Change-Id: Ia7d3bc39cb2b0f225e827f64eb17d061d594b265 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_plugin.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index bf90adcf1e..40528a65e2 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -35,9 +35,9 @@ CONFIG += relative_qt_rpath # Qt's plugins should be relocatable
# Qt libraries should only use Application Extension safe APIs
darwin:!no_app_extension_api_only: CONFIG += app_extension_api_only
-CONFIG(static, static|shared)|prefix_build {
- isEmpty(MODULE): MODULE = $$basename(TARGET)
+isEmpty(MODULE): MODULE = $$basename(TARGET)
+CONFIG(static, static|shared)|prefix_build {
mod_work_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
force_independent: \
mod_inst_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst