summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-01 08:23:12 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:46:00 +0200
commit5cea63d2f2dfa2f695cc806acf97d4f9854ecf40 (patch)
tree2d8e7a7f4031b08c3c817c6fa2d0c664cc33750a /mkspecs
parent88a07df5e5e399f9d60ee9a3bfac86c577ab7d95 (diff)
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>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_module_config.prf2
1 files changed, 2 insertions, 0 deletions
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): \