Skip to content

Commit 1b03163

Browse files
ossilatorThe Qt Project
authored andcommitted
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 <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
1 parent 1243940 commit 1b03163

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mkspecs/features/qt_helper_lib.prf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ contains(QT_CONFIG, build_all): CONFIG += build_all
2020
DESTDIR = $$MODULE_BASE_OUTDIR/lib
2121
DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
2222

23-
# Static builds always need to be installed, as the convenience libraries
24-
# are not linked to the final library in this case.
25-
installed|static: load(qt_installs)
23+
# In static builds of Qt, convenience libraries must be installed,
24+
# as in this case they are not linked to the final library/plugin.
25+
installed|contains(QT_CONFIG, static): load(qt_installs)
2626

2727
TARGET = $$qtLibraryTarget($$TARGET)

0 commit comments

Comments
 (0)