Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4c0ae2ac1c10d4d50c03625c802d981b7850ed6f

4 files changed, 24 insertions, 20 deletions

diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf
index a67fd9af9b..2dc72a7a2f 100644
--- a/mkspecs/features/cmake_functions.prf
+++ b/mkspecs/features/cmake_functions.prf
@@ -54,7 +54,7 @@ defineReplace(cmakeProcessLibs) {
     variable = $$1
     out =
     for(v, variable) {
-        if(!equals(v, -framework):!equals(v, -L.*)) {
+        if(!equals(v, -framework):!contains(v, -L.*)) {
             v ~= s,^-l,,
             v ~= s,^-lib,,
             v ~= s,.lib$,,
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 0538a81771..b183814e63 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -1,12 +1,12 @@
 load(default_post)
 !no_objective_c:CONFIG += objective_c
 
-# Pick a suitable default architecture for qmake-based applications.
-# If the Qt package contains one of x86 and x86_64, pick that one. If it
-# contains both then use the compiler default. Make a similiar decision for
-# PowerPC-based systems. Note that this logic assumes that Qt has been
-# configured with an architecture that is usable on the system.
 qt:!isEmpty(QT_CONFIG) {
+    # Pick a suitable default architecture for qmake-based applications.
+    # If the Qt package contains one of x86 and x86_64, pick that one. If it
+    # contains both then use the compiler default. Make a similar decision for
+    # PowerPC-based systems. Note that this logic assumes that Qt has been
+    # configured with an architecture that is usable on the system.
     contains(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") {
         !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc
         contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64
@@ -14,6 +14,9 @@ qt:!isEmpty(QT_CONFIG) {
         !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86
         contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64
     }
+
+    # Ensure that C++11 is always used when linking against a static Qt build
+    contains(QT_CONFIG, static):contains(QT_CONFIG, c++11): CONFIG += c++11
 }
 
 isEmpty(_QMAKE_CACHE_) {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 2f5deb8e43..cd74c1d7cf 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -74,17 +74,17 @@ defineTest(qtAddModule) {
     }
 
     unset(LINKAGE)
-    mac {
-        contains(MODULE_CONFIG, lib_bundle) {
+    mac:contains(MODULE_CONFIG, lib_bundle) {
           FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
           !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
                INCLUDEPATH *= $$FRAMEWORK_INCLUDE
-               LINKAGE = -F$${MODULE_LIBS}
-          } else {
-               QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
           }
+          auto_use_privates|isEqual(2, UsePrivate): \
+               INCLUDEPATH += \
+                    $$FRAMEWORK_INCLUDE/$$eval(QT.$${1}.VERSION) \
+                    $$FRAMEWORK_INCLUDE/$$eval(QT.$${1}.VERSION)/$$MODULE_NAME
+          QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
           LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX}
-        }
     }
 
     # Re-insert the major version in the library name (cf qtLibraryTarget above)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 429e00bed9..46f8e56ad5 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -91,14 +91,15 @@ else: \
 mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
    #QMAKE_FRAMEWORK_VERSION = 4.0
    CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
-   CONFIG(release, debug|release) {
-      !debug_and_release|build_pass {
-          CONFIG -= qt_install_headers #no need to install these as well
-          FRAMEWORK_HEADERS.version = Versions
-          FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-          FRAMEWORK_HEADERS.path = Headers
-      }
-      QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+   CONFIG -= qt_install_headers #no need to install these as well
+   !debug_and_release|if(build_all:CONFIG(release, debug|release)) {
+        FRAMEWORK_HEADERS.version = Versions
+        FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+        FRAMEWORK_HEADERS.path = Headers
+        FRAMEWORK_PRIVATE_HEADERS.version = Versions
+        FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES
+        FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME
+        QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS FRAMEWORK_PRIVATE_HEADERS
    }
 }