From e707d02cc8bd91b49857e3d195fb13b50548fc58 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 10 Dec 2015 17:26:20 +0100
Subject: un-nest enabling .la creation from enabling .pc creation (again)

now that we don't create .pc files for private modules any more, the
conditionals cannot be nested.

amends 6c5d227da, partially reverting aa20e7f9d.

Task-number: QTBUG-49763
Change-Id: I2578c83e0c767b6533abdb26bf4e8bcc8c416ef1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 mkspecs/features/qt_module.prf | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 3675d7d87f..a80eba6607 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -257,19 +257,18 @@ load(qt_targets)
         pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
     pclib_replace.CONFIG = path
     QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
-
-    unix {
-        CONFIG += create_libtool
-        host_build: \
-            QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
-        else: \
-            QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
-        ltlib_replace.match = $$lib_replace.match
-        !isEmpty(lib_replace.replace): \
-            ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
-        ltlib_replace.CONFIG = path
-        QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
-    }
+}
+!lib_bundle:unix {
+    CONFIG += create_libtool
+    host_build: \
+        QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+    else: \
+        QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
+    ltlib_replace.match = $$lib_replace.match
+    !isEmpty(lib_replace.replace): \
+        ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
+    ltlib_replace.CONFIG = path
+    QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
 }
 
 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-- 
cgit v1.2.3