Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	mkspecs/features/qt_module_headers.prf
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qwidget/BLACKLIST

Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c

3 files changed, 12 insertions, 11 deletions

diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index 50a1ec6764..21d487f1f9 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -210,3 +210,10 @@ cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
     cache(QMAKE_XCODE_VERSION, stash)
 
 QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
+
+xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
+xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
+isEmpty(xcode_product_bundle_identifier_setting.value): \
+    xcode_product_bundle_identifier_setting.value = "com.yourcompany"
+xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}"
+QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index f1a4ca77b2..e3534561a5 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -58,10 +58,3 @@ QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
 xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
 xcode_copy_phase_strip_setting.value = NO
 QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
-
-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
-isEmpty(xcode_product_bundle_identifier_setting.value): \
-    xcode_product_bundle_identifier_setting.value = "com.yourcompany"
-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}"
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 72471d7a01..bbded56b42 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -114,8 +114,6 @@ 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)
-syncQtResolve(INJECTED_HEADER_FILES, $$OUT_PWD)
-syncQtResolve(INJECTED_PRIVATE_HEADER_FILES, $$OUT_PWD)
 !lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
     CONFIG += qt_install_headers
 
@@ -129,8 +127,6 @@ exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) {
     SYNCQT.INJECTIONS += \
         $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \
         $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h
-    SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}.h
-    SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}_p.h
 }
 
 for (injection, SYNCQT.INJECTIONS) {
@@ -143,6 +139,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
@@ -150,6 +150,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
     }
 }