From bd804329f5438b3a9d248d0ad58a69dcbc45c4a3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 25 Apr 2014 15:31:07 +0200
Subject: install convenience libraries when building statically
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 mkspecs/features/qt_helper_lib.prf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

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)
-- 
cgit v1.2.3