Merge remote-tracking branch 'origin/5.11.0' into wip/webassembly

Change-Id: I8de4175dc71efbedb1060cc25e0cba6e1108c77b

17 files changed, 89 insertions, 60 deletions

diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf
index fae2c8ebd9..b665000d00 100644
--- a/mkspecs/android-clang/qmake.conf
+++ b/mkspecs/android-clang/qmake.conf
@@ -42,7 +42,6 @@ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$A
 ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so
 ANDROID_CXX_STL_LIBS = -lc++
 
-QMAKE_ARM_CFLAGS_RELEASE                   = -Oz
-QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -Oz
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
 
 include(../common/android-base-tail.conf)
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index c8145ae66b..e72c802405 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -31,7 +31,4 @@ else: \
     LIBGCC_PATH_FULL = $$system("$$QMAKE_CXX -print-libgcc-file-name")
 ANDROID_SOURCES_CXX_STL_LIBDIR += $$dirname(LIBGCC_PATH_FULL)
 
-QMAKE_ARM_CFLAGS_RELEASE                   = -Os
-QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -Os
-
 include(../common/android-base-tail.conf)
diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf
index 160caf011f..7c3ae9566a 100644
--- a/mkspecs/common/android-base-tail.conf
+++ b/mkspecs/common/android-base-tail.conf
@@ -14,8 +14,7 @@ else: equals(ANDROID_TARGET_ARCH, armeabi): \
 QMAKE_CFLAGS_WARN_ON    = -Wall -W
 QMAKE_CFLAGS_WARN_OFF   =
 equals(ANDROID_TARGET_ARCH, armeabi-v7a) | equals(ANDROID_TARGET_ARCH, armeabi) {
-    QMAKE_CFLAGS_RELEASE                   = $$QMAKE_ARM_CFLAGS_RELEASE
-    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO    = $$QMAKE_ARM_CFLAGS_RELEASE_WITH_DEBUGINFO
+    CONFIG += optimize_size
     QMAKE_CFLAGS_DEBUG                     = -g -marm -O0
     equals(ANDROID_TARGET_ARCH, armeabi):if(equals(NDK_TOOLCHAIN_VERSION, 4.8)|equals(NDK_TOOLCHAIN_VERSION, 4.9)) {
         DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND
@@ -23,13 +22,6 @@ equals(ANDROID_TARGET_ARCH, armeabi-v7a) | equals(ANDROID_TARGET_ARCH, armeabi)
         QMAKE_CFLAGS_RELEASE += -mthumb
         QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb
     }
-
-    # Don't override our options with -O3
-    QMAKE_CFLAGS_OPTIMIZE_FULL =
-} else {
-    QMAKE_CFLAGS_RELEASE                   = -O2
-    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -O2
-    QMAKE_CFLAGS_DEBUG                     = -g
 }
 
 QMAKE_CFLAGS_SHLIB      = -fPIC
diff --git a/mkspecs/features/configure_base.prf b/mkspecs/features/configure_base.prf
index e870e2ee10..73e0273f18 100644
--- a/mkspecs/features/configure_base.prf
+++ b/mkspecs/features/configure_base.prf
@@ -23,9 +23,29 @@ QMAKE_MAKE_NAME = $$basename(QMAKE_MAKE)
 # Make sure we don't inherit MAKEFLAGS - -i in particular is fatal.
 QMAKE_MAKE = "$${SETENV_PFX}MAKEFLAGS=$$SETENV_SFX $$QMAKE_MAKE"
 
+QMAKE_PERSIST_LOG = false
+QMAKE_PERSISTED_LOG =
+
 defineTest(qtLog) {
     write_file($$QMAKE_CONFIG_LOG, 1, append)
     $$QMAKE_CONFIG_VERBOSE: for (l, 1): log("$$l$$escape_expand(\\n)")
+    $$QMAKE_PERSIST_LOG {
+        QMAKE_PERSISTED_LOG += $$1
+        export(QMAKE_PERSISTED_LOG)
+    }
+}
+
+defineTest(qtPersistLog) {
+    QMAKE_PERSIST_LOG = true
+    QMAKE_PERSISTED_LOG =
+    export(QMAKE_PERSIST_LOG)
+    export(QMAKE_PERSISTED_LOG)
+}
+
+defineReplace(qtPersistedLog) {
+    QMAKE_PERSIST_LOG = false
+    export(QMAKE_PERSIST_LOG)
+    return($$QMAKE_PERSISTED_LOG)
 }
 
 defineTest(qtRunLoggedCommand) {
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index bb5083c925..66acedef55 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -53,7 +53,9 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
     CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
 }
 
-!exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
+isEmpty(QT.$${MODULE}_private.includes)| \
+        !exists($$first(QT.$${MODULE}_private.includes)): \
+    CMAKE_NO_PRIVATE_INCLUDES = true
 
 CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
 contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf
index 1e3f9d2c1c..0d5ff5f89c 100644
--- a/mkspecs/features/ctest_testcase_common.prf
+++ b/mkspecs/features/ctest_testcase_common.prf
@@ -20,7 +20,7 @@ isEmpty(CTEST_VERSION) {
     return()
 }
 
-!versionAtLeast(CMAKE_VERSION, 2.8.3) {
+!versionAtLeast(CMAKE_VERSION, 3.1.0) {
     message("cmake $$CMAKE_VERSION is too old for this test.")
     return()
 }
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 55c74aad66..27f4c277d6 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -1,13 +1,7 @@
 
-!!IF !equals(TEMPLATE, aux)
-if (CMAKE_VERSION VERSION_LESS 2.8.3)
-    message(FATAL_ERROR \"Qt 5 requires at least CMake version 2.8.3\")
-endif()
-!!ELSE
-if (CMAKE_VERSION VERSION_LESS 3.0.0)
-    message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.0.0\")
+if (CMAKE_VERSION VERSION_LESS 3.1.0)
+    message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
 endif()
-!!ENDIF
 
 !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -161,9 +155,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
 !!IF !isEmpty(CMAKE_INTERFACE_MODULE_DEPS)
-    if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-        list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
-    endif()
+    list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
 !!ENDIF
 
     set(Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@@ -219,9 +211,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
 
 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
-    if (NOT CMAKE_VERSION VERSION_LESS 3.0.0)
-        list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
-    endif()
+    list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -252,8 +242,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endif()
     endforeach()
 
-    if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST
-        AND NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+    if (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST)
         add_library(Qt5::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED)
         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
             INTERFACE_INCLUDE_DIRECTORIES ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}
diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf
index b477cff162..2d7f0e1ab6 100644
--- a/mkspecs/features/exclusive_builds.prf
+++ b/mkspecs/features/exclusive_builds.prf
@@ -38,5 +38,5 @@ defineTest(addExclusiveBuilds) {
 }
 
 # Default directories to process
-QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR TRACEGEN_DIR
-QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR
+QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR TRACEGEN_DIR QMLCACHE_DIR
+QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR QMLCACHE_DIR
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index bbcad8125c..8360dd8b38 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -8,21 +8,21 @@ contains(QMAKE_MAC_SDK, .*/.*): \
 defineReplace(xcodeSDKInfo) {
     info = $$1
     equals(info, "Path"): \
-        info = --show-sdk-path
+        infoarg = --show-sdk-path
     equals(info, "PlatformPath"): \
-        info = --show-sdk-platform-path
+        infoarg = --show-sdk-platform-path
     equals(info, "SDKVersion"): \
-        info = --show-sdk-version
+        infoarg = --show-sdk-version
     sdk = $$2
     isEmpty(sdk): \
         sdk = $$QMAKE_MAC_SDK
 
     isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
-        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
+        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
         # --show-sdk-platform-path won't work for Command Line Tools; this is fine
         # only used by the XCTest backend to testlib
-        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
-            error("Could not resolve SDK $$info for \'$$sdk\'")
+        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
+            error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
         cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
     }
 
diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf
index 4dfec50be8..216f37d61a 100644
--- a/mkspecs/features/qmltestcase.prf
+++ b/mkspecs/features/qmltestcase.prf
@@ -1,7 +1,6 @@
 !isEmpty(SOURCES) {
     QT += qml qmltest
     load(testcase)
-    CONFIG -= app_bundle
     DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\"
 } else {
     # Allow a project to run tests without a CPP stub
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index a2fa1be481..021036e4f9 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -26,6 +26,7 @@ MOC_DIR = .moc
 RCC_DIR = .rcc
 UI_DIR = .uic
 TRACEGEN_DIR = .tracegen
+QMLCACHE_DIR = .qmlcache
 intel_icl {
     # ICL 14.0 has a bug that makes it not find #includes in dirs starting with .
     MOC_DIR = tmp/moc
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index d80bfde567..10c7025434 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -710,13 +710,14 @@ defineTest(qtConfHandleLibrary) {
     }
     use_args = $$eval($${lpfx}.literal_args)
 
-    qtConfLoadResult($${lpfx}, $$1) {
+    qtConfLoadResult($${lpfx}, $$1, "library") {
         $$eval($${lpfx}.result): \
             qtConfExportLibrary($$1)
         return()
     }
 
     qtLogTestIntro($${lpfx}, "looking for library $${1}")
+    qtPersistLog()
 
     result = false
     for (s, $${lpfx}.sources._KEYS_) {
@@ -768,6 +769,9 @@ defineTest(qtConfHandleLibrary) {
         break()
     }
 
+    $${lpfx}.msgs = $$qtPersistedLog()
+    export($${lpfx}.msgs)
+
     qtLogTestResult($${lpfx}, $$result)
 
     $${lpfx}.result = $$result
@@ -1024,7 +1028,7 @@ defineTest(qtLogTestIntro) {
     label = $$eval($${1}.label)
     isEmpty(label): return()
 
-    log("Checking for $${label}... ")
+    isEmpty(3): log("Checking for $${label}... ")
     $$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)")
     write_file($$QMAKE_CONFIG_LOG, 2, append)
 }
@@ -1044,14 +1048,14 @@ defineTest(qtLogTestResult) {
         msg = "test $$1 FAILED"
     }
     $$QMAKE_CONFIG_VERBOSE: log_msg = $$msg
-    logn("$$log_msg")
+    isEmpty(3): logn("$$log_msg")
     write_file($$QMAKE_CONFIG_LOG, msg, append)
 }
 
 defineTest(qtConfSaveResult) {
     equals($${1}.cache, -): \
         return()
-    keys = result $$eval($${1}.cache)
+    keys = result msgs $$eval($${1}.cache)
     cont = "cache.$${2}._KEYS_ = $$keys"
     cache.$${2}._KEYS_ = $$keys
     export(cache.$${2}._KEYS_)
@@ -1074,6 +1078,12 @@ defineTest(qtConfLoadResult) {
         $${1}.$${k} = $$eval(cache.$${2}.$${k})
         export($${1}.$${k})
     }
+    # we could print the cached result, but that's basically just noise -
+    # the explicitly generated summary is supposed to contain all relevant
+    # information.
+    qtLogTestIntro($$1, "loaded result for $$3 $$1", false)
+    qtLog($$eval($${1}.msgs))
+    qtLogTestResult($$1, $$eval($${1}.result), false)
     return(true)
 }
 
@@ -1154,14 +1164,18 @@ defineTest(qtRunSingleTest) {
     # note: we do this only after resolving the dependencies and the
     # preparation (which may resolve libraries), so that caching does
     # not alter the execution order (and thus the output).
-    qtConfLoadResult($${tpfx}, $$1): \
+    qtConfLoadResult($${tpfx}, $$1, "config test"): \
         return()
 
     qtLogTestIntro($${tpfx}, "executing config test $${1}")
+    qtPersistLog()
 
     result = false
     $${call}($${tpfx}): result = true
 
+    $${tpfx}.msgs = $$qtPersistedLog()
+    export($${tpfx}.msgs)
+
     qtLogTestResult($${tpfx}, $$result)
 
     $${tpfx}.result = $$result
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 90d84cc535..8f98987b99 100644
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -28,9 +28,9 @@
 
 #headers
 qt_install_headers {
-    class_headers.files = $$SYNCQT.HEADER_CLASSES
-    class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
-    INSTALLS += class_headers
+    gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
+    gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
+    INSTALLS += gen_headers
 
     targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
     targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index e6a0d97f1a..f8729de947 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -136,7 +136,7 @@ lib_bundle {
            if(if(!debug_and_release|CONFIG(release, debug|release))) {
         FRAMEWORK_HEADERS.version = Versions
         FRAMEWORK_HEADERS.files = \
-            $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES $$SYNCQT.INJECTED_HEADER_FILES
+            $$SYNCQT.HEADER_FILES $$SYNCQT.GENERATED_HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
         FRAMEWORK_HEADERS.path = Headers
         FRAMEWORK_PRIVATE_HEADERS.version = Versions
         FRAMEWORK_PRIVATE_HEADERS.files = \
@@ -224,7 +224,7 @@ android: CONFIG += qt_android_deps no_linker_version_script
         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
 
         for(header, private_api_headers): \
-            verscript_content += "    @FILE:$${_PRO_FILE_PWD_}/$$header@"
+            verscript_content += "    @FILE:$$header@"
         verscript_content += "};"
 
         current = Qt_$$QT_MAJOR_VERSION
@@ -244,8 +244,7 @@ android: CONFIG += qt_android_deps no_linker_version_script
         verscriptprocess.name = linker version script ${QMAKE_FILE_BASE}
         verscriptprocess.input = verscript_in
         verscriptprocess.CONFIG += no_link target_predeps
-        for(header, private_api_headers): \
-            verscriptprocess.depends += $${_PRO_FILE_PWD_}/$$header
+        verscriptprocess.depends = $$private_api_headers
         verscriptprocess.output = $$verscript
         verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < ${QMAKE_FILE_IN} > $@
         silent:verscriptprocess.commands = @echo creating linker version script ${QMAKE_FILE_BASE} && $$verscriptprocess.commands
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 62b88c6fe2..e45ac94966 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -96,12 +96,24 @@ MODULE_PRIVATE_INCLUDES += $$MODULE_PRIVATE_AUX_INCLUDES
 
 minimal_syncqt: return()
 
+defineTest(syncQtResolve) {
+    out =
+    for (f, SYNCQT.$$1): \
+        out += $$absolute_path($$f, $$2)
+    SYNCQT.$$1 = $$out
+    export(SYNCQT.$$1)
+}
+
 #load up the headers info
 git_build: \
     INC_PATH = $$MODULE_BASE_OUTDIR
 else: \
     INC_PATH = $$MODULE_BASE_INDIR
 include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
+syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_)
+syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_)
+syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_)
+syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME)
 !lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
     CONFIG += qt_install_headers
 
@@ -114,9 +126,6 @@ exists($$OUT_PWD/qt$${MODULE}-config.h) {
     SYNCQT.INJECTIONS += \
         $$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
         $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
-    inst_rel = $$relative_path($$OUT_PWD, $$_PRO_FILE_PWD_)
-    SYNCQT.HEADER_FILES += $$inst_rel/qt$${MODULE}-config.h
-    SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$inst_rel/qt$${MODULE}-config_p.h
 }
 
 for (injection, SYNCQT.INJECTIONS) {
@@ -129,6 +138,10 @@ for (injection, SYNCQT.INJECTIONS) {
     write_file($$MAIN_FWD, MAIN_FWD_CONT)|error()
     equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr)
     !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD
+    !contains(ofwd_hdr, .*/private/.*): \
+        SYNCQT.INJECTED_HEADER_FILES += $$dst_hdr
+    else: \
+        SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$dst_hdr
     injects = $$member(injects, 2, -1)
     for (inject, injects) {
         CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject
@@ -136,6 +149,7 @@ for (injection, SYNCQT.INJECTIONS) {
         write_file($$CLASS_FWD, CLASS_FWD_CONT)|error()
         touch($$CLASS_FWD, $$MAIN_FWD)
         !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD
+        SYNCQT.INJECTED_HEADER_FILES += $$CLASS_FWD
     }
 }
 
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index 3f5979202c..ff45446219 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -33,7 +33,7 @@ for(resource, RESOURCES) {
         next()
     }
 
-    resource_file = $$RCC_DIR/qmake_$${resource}.qrc
+    resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
 
     isEmpty(BUILDS)|build_pass {
         # Collection of files, generate qrc file
@@ -64,7 +64,7 @@ for(resource, RESOURCES) {
             "</qresource>" \
             "</RCC>"
 
-        !write_file($$absolute_path($$resource_file, $$OUT_PWD), resource_file_content): \
+        !write_file($$resource_file, resource_file_content): \
             error()
     }
 
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index 170464d08f..14c885fd78 100644
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -11,13 +11,16 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
 # configure \
 #   -pkg-config \
 #   -fontconfig -system-freetype \
-#   -system-xcb -xkb -no-opengl \
-#   -qt-xkbcommon -qt-xkbcommon-x11
+#   -system-xcb -no-opengl
 #
 # Ensure that pkg-config is properly configured, or that
 #   PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig
 # is set in your build environment.
 #
+# If you don't want to use pkg-config, you can add:
+#   -L/opt/X11/lib -I/opt/X11/include
+# to the configure options.
+#
 # Due to irreconcilable differences between Cocoa
 # and X11, OpenGL is currently not supported.