From 1b031630ded1fbb9a94642de1d720651a390a03b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 May 2014 16:38:06 +0200 Subject: [PATCH] fix too aggressive installation of helper libraries of course all helper libraries are built statically, so the criterion is not useful. what is interesting is whether the whole qt configuration is static, as that determines what will happen with the helper library when linking the final "actual" artifacts. Change-Id: I96980c645cb478b2f7a30688b49cb51bec8c9f08 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_helper_lib.prf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 4af5bcaabb8..b2bb55bb1e6 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -20,8 +20,8 @@ contains(QT_CONFIG, build_all): CONFIG += build_all DESTDIR = $$MODULE_BASE_OUTDIR/lib DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin -# Static builds always need to be installed, as the convenience libraries -# are not linked to the final library in this case. -installed|static: load(qt_installs) +# In static builds of Qt, convenience libraries must be installed, +# as in this case they are not linked to the final library/plugin. +installed|contains(QT_CONFIG, static): load(qt_installs) TARGET = $$qtLibraryTarget($$TARGET)