From 8cc27590bd2a04ce841cdb66f234ff13f11148af Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Mon, 11 Jun 2018 13:48:43 +0200 Subject: 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 --- mkspecs/features/qt_plugin.prf | 4 ++-- 1 file 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 -- cgit v1.2.3