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>
This commit is contained in:
parent
1243940f83
commit
1b031630de
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user