Merge branch 'release' into stable

Change-Id: I982a86e1b99e3ae629e8c5667bc7bdf9f4018b2e

mkspecs/features/qt_functions.prf

@@ -61,6 +61,9 @@ defineTest(qtAddModule) {
     MODULE_CONFIG = $$eval(QT.$${1}.module_config)
     MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION)
 
+    isEmpty(MODULE_INCLUDES):!if(auto_use_privates|isEqual(2, UsePrivate)): \
+        error("Module $$1 has no public API.")
+
     qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG)
     qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES)
 

mkspecs/features/qt_headersclean.prf

@@ -36,7 +36,8 @@ TARGET = tst_headersclean
 
 includes =
 for(q, QT) {
-    qn = $$eval(QT.$${q}.name)
+    sq = $$replace(q, -private\$, )
+    qn = $$eval(QT.$${sq}.name)
     isEmpty(qn): \
         QT -= $$q
     else: \

mkspecs/features/qt_module.prf

@@ -91,7 +91,6 @@ else: \
 mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
    #QMAKE_FRAMEWORK_VERSION = 4.0
    CONFIG += lib_bundle qt_framework
-   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

tests/auto/other/headersclean/headersclean.pro

@@ -1,3 +1,3 @@
-QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport
+QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport-private
 load(qt_headersclean)
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0