From 5cea63d2f2dfa2f695cc806acf97d4f9854ecf40 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 1 Jun 2012 08:23:12 +0200
Subject: let modules which are frameworks remember that fact

this will allow us to not rely on the modules matching the global
qt_framework setting.

Change-Id: Ic1dce757ff63d06af54a2428e23a1bbcf1c81ba1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 mkspecs/features/qt_module_config.prf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 28d70c1f73..010c5cae43 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -44,6 +44,8 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri
     # Create a module .pri file
     staticlib: \
         module_build_type = "QT.$${MODULE}.module_config = staticlib"
+    else:mac:!static:contains(QT_CONFIG, qt_framework): \
+        module_build_type = "QT.$${MODULE}.module_config = lib_bundle"
     else: \
         module_build_type =
     !isEmpty(MODULE_CONFIG): \
-- 
cgit v1.2.3