diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-07 16:38:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-20 19:23:58 +0200 |
| commit | 1b031630ded1fbb9a94642de1d720651a390a03b (patch) | |
| tree | b62fa7572b285ab2798fe172ebb657b5cb7bd537 /mkspecs/features/qt_helper_lib.prf | |
| parent | 1243940f83a5c04cc0eb64a0d1679dab3b7164f1 (diff) | |
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>
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 4af5bcaabb..b2bb55bb1e 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) |