diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-25 15:31:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 19:50:08 +0200 |
| commit | bd804329f5438b3a9d248d0ad58a69dcbc45c4a3 (patch) | |
| tree | fbf3a2faeb91782659dff679b23c1637f890627b | |
| parent | 40b195d0f9ee7ef1b917a635bb073fa108b2ed40 (diff) | |
install convenience libraries when building statically
we don't link static libs into other static libs, so the intermediate
libs need to be installed and resolved at app link time.
Task-number: QTBUG-32519
Change-Id: I0558140f98a6938b03306df7f800d66f8a19a7cd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index cb7bc2c8a8..4af5bcaabb 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -20,6 +20,8 @@ contains(QT_CONFIG, build_all): CONFIG += build_all DESTDIR = $$MODULE_BASE_OUTDIR/lib DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin -installed: load(qt_installs) +# 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) TARGET = $$qtLibraryTarget($$TARGET) |