From 2e6754d9427de8d49b264a526434f49f25e7208d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 19 Nov 2015 16:50:16 +0100
Subject: fix the determination whether to build a module as a framework

CONFIG+=qt_framework is actually put into qconfig.pri, so it's always
set in framework builds. things (sometimes) worked only by virtue of the
qt_framework checks being in "else" branches of "static" checks. use
lib_bundle instead, which triggers the actual framework build anyway.

amends b72d1db44.

Change-Id: Ib725c43476d9fb38bad940ce09905d29ff3edfa3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 mkspecs/features/qt_module.prf      | 8 +++-----
 mkspecs/features/qt_module_pris.prf | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 663bddffb0..0972e7f3c4 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -43,7 +43,7 @@ host_build {
 }
 
 mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
-    CONFIG += qt_framework
+    CONFIG += lib_bundle
 
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
 
@@ -106,7 +106,7 @@ else: \
     DEFINES += QT_BUILD_$${ucmodule}_LIB
 
 # OS X and iOS frameworks
-qt_framework {
+lib_bundle {
    # Set the CFBundleIdentifier prefix for Qt frameworks
    QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project
    #QMAKE_FRAMEWORK_VERSION = 4.0
@@ -115,8 +115,6 @@ qt_framework {
         CONFIG += bundle
         QMAKE_BUNDLE_EXTENSION = .framework
         QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib
-   } else {
-        CONFIG += lib_bundle
    }
    CONFIG -= qt_install_headers #no need to install these as well
    !debug_and_release|!build_all|CONFIG(release, debug|release) {
@@ -239,7 +237,7 @@ load(qt_installs)
 load(qt_targets)
 
 # this builds on top of qt_common
-!internal_module:!qt_framework:if(unix|mingw) {
+!internal_module:!lib_bundle:if(unix|mingw) {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
     host_build: \
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 8c05b90cd6..3f21a0f7d5 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -55,7 +55,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         module_rundep =
     static: \
         module_build_type = staticlib
-    else: qt_framework: \
+    else: lib_bundle: \
         module_build_type = lib_bundle
     else: \
         module_build_type =
-- 
cgit v1.2.3