From b72d1db446231311a7ee855ed3e0fbb64a62ea06 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 11 Nov 2015 17:59:18 +0100
Subject: [PATCH] centralize determination whether a module is built as a
 framework

Change-Id: Ie5f8ab6bb789536707050f0fd83b953650028cf2
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
---
 mkspecs/features/qt_module.prf      | 7 +++++--
 mkspecs/features/qt_module_pris.prf | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 391c923327..663bddffb0 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -42,6 +42,9 @@ host_build {
     }
 }
 
+mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
+    CONFIG += qt_framework
+
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
 
 ucmodule = $$upper($$MODULE)
@@ -103,11 +106,11 @@ else: \
     DEFINES += QT_BUILD_$${ucmodule}_LIB
 
 # OS X and iOS frameworks
-mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
+qt_framework {
    # Set the CFBundleIdentifier prefix for Qt frameworks
    QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project
    #QMAKE_FRAMEWORK_VERSION = 4.0
-   CONFIG += sliced_bundle qt_framework
+   CONFIG += sliced_bundle
    header_module {
         CONFIG += bundle
         QMAKE_BUNDLE_EXTENSION = .framework
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index cc6d48ac21..8c05b90cd6 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:mac:contains(QT_CONFIG, qt_framework): \
+    else: qt_framework: \
         module_build_type = lib_bundle
     else: \
         module_build_type =