From 4c5584f0a3c003106d07d0cf8b512108b9ff541a Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Dec 2012 11:51:28 +0200 Subject: Fix installation of plugin module .pris in static Qt builds When building Qt static, plugins get module .pri file, but those files do not get installed in Windows. This is because both .pri generation and install target statements are scoped with !build_pass, which means Makefile.Debug and Makefile.Release do not get install_pritarget target. Fixed by doing only the .pri generation in !build_pass scope. Task-number: QTBUG-28606 Change-Id: If3f49b578af1d9171a8bce67793ecb3f902a6da8 Reviewed-by: Oswald Buddenhagen Reviewed-by: Mark Brand --- mkspecs/features/qt_plugin.prf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mkspecs/features/qt_plugin.prf') diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index e58a6d2679..4861576eba 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -31,16 +31,18 @@ contains(QT_CONFIG, c++11):CONFIG += c++11 contains(QT_CONFIG, static):CONFIG += static else:CONFIG += shared -!build_pass:static { +static { isEmpty(MODULE): MODULE = $$basename(TARGET) MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri - MODULE_PRI_CONT = \ - "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \ - "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" + !build_pass { + MODULE_PRI_CONT = \ + "QT_PLUGIN.$${MODULE}.TYPE = $$PLUGIN_TYPE" \ + "QT_PLUGIN.$${MODULE}.CLASS_NAME = $$PLUGIN_CLASS_NAME" - write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") + write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") + } pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules pritarget.files = $$MODULE_PRI -- cgit v1.2.3