Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8

4 files changed, 14 insertions, 8 deletions

diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 3da6bf8c11..ea235514b7 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -90,7 +90,7 @@ warnings_are_errors:warning_clean {
             #      (NULL in C++ is usually a literal 0)
             QMAKE_CXXFLAGS_WARN_ON += -Werror -ww177,1224,1478,1881 $$WERROR
         }
-    } else:gcc:!clang:!intel_icc {
+    } else:gcc:!clang:!intel_icc:!rim_qcc {
         # GCC 4.6-4.9, 5.x, ...
         ver = $${QT_GCC_MAJOR_VERSION}.$${QT_GCC_MINOR_VERSION}
         contains(ver, "(4\\.[6789]|[5-9]\\..)") {
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 22ead1b2b4..36f632e8ca 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -41,8 +41,12 @@ host_build {
     }
 }
 
-CONFIG(shared, static|shared):qtConfig(framework): \
-    CONFIG += lib_bundle
+qtConfig(framework) {
+    minimal_syncqt: \
+        CONFIG += module_frameworks
+    else: CONFIG(shared, static|shared): \
+        CONFIG += module_frameworks lib_bundle
+}
 
 CONFIG += relative_qt_rpath  # Qt libraries should be relocatable
 
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 0e04b46448..648723d6ff 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -59,7 +59,9 @@ load(qt_build_paths)
 # even beyond the module's own build. The implication of this is that
 # qmake might never use a framework's headers in a non-prefix build,
 # as there is no separate set of .pri files for users outside Qt.
-prefix_build:lib_bundle: \
+# Borrowing is assumed to happen from modules which, in a framework build,
+# actually are frameworks.
+prefix_build:module_frameworks: \
     fwd = _FWD
 # When using a split include path during the build, the installed module's
 # include path is also structurally different from that in the build dir.
@@ -82,7 +84,7 @@ for(mod, MODULE_INCNAME) {
         generated_privates: \
             MODULE$${sfwd}$${prv}_INCLUDES += $$mbibase/$$VERSION $$mbibase/$$VERSION/$$mod
     }
-    prefix_build:lib_bundle {
+    prefix_build:module_frameworks {
         mfbase = \$\$QT_MODULE_LIB_BASE/$${mod}.framework/Headers
         MODULE_INCLUDES += $$mfbase
         MODULE$${prv}_INCLUDES += $$mfbase/$$VERSION $$mfbase/$$VERSION/$$mod
@@ -178,7 +180,7 @@ headersclean:!internal_module {
                  -Dforeach=public: \
                  -Dforever=public:
 
-    gcc {
+    gcc:!rim_qcc {
         # Turn on some extra warnings not found in -Wall -Wextra.
         # Common to GCC, Clang and ICC (and other compilers that masquerade as GCC):
         hcleanFLAGS = -Wall -Wextra -Werror \
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 72d676da6f..163f52f23f 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -83,10 +83,10 @@ defineReplace(qtExportLibsForModule) {
     module_build_type = v2
     static: \
         module_build_type += staticlib
-    lib_bundle {
+    lib_bundle: \
         module_build_type += lib_bundle
+    module_frameworks: \
         MODULE_FRAMEWORKS = " \$\$QT_MODULE_LIB_BASE"
-    }
     internal_module: \
         module_build_type += internal_module
     ltcg: \