Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/corelib/serialization/qcborvalue.cpp

Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52

3 files changed, 31 insertions, 9 deletions

diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 364c23e750..5077b8d8b4 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -173,11 +173,20 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     endif()
 
     set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
-    if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
+    if(_static_link_flags)
         set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-            \"${_static_link_flags_genex}\"
-        )
+        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+                \"${_static_link_flags_genex}\"
+            )
+        else()
+            # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+            # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+            string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+                \"${_static_link_flags_genex}\"
+            )
+        endif()
     endif()
 !!ENDIF
 
@@ -546,11 +555,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endif()
 
         set(_static_link_flags \"${_Qt5${Plugin}_STATIC_${Configuration}_LINK_FLAGS}\")
-        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
+        if(_static_link_flags)
             set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-            set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-                \"${_static_link_flags_genex}\"
-            )
+            if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+                    \"${_static_link_flags_genex}\"
+                )
+            else()
+                # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+                # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+                string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+                    \"${_static_link_flags_genex}\"
+                )
+            endif()
         endif()
 !!ENDIF
     endmacro()
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index deb4ac2829..095bf15dac 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -45,6 +45,8 @@ isEmpty(WIN_INCLUDETEMP) {
     QDOC_INCLUDE_PATHS=@$$shell_quote($$WIN_INCLUDETEMP)
 }
 
+macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I")
+
 !build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
 
 qtPrepareTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)
@@ -93,7 +95,6 @@ qtattributionsscanner.CONFIG += phony
 QMAKE_EXTRA_TARGETS += qtattributionsscanner
 
 doc_command = $$QDOC $$QMAKE_DOCS
-
 prepare_docs {
     prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors $$QDOC_INCLUDE_PATHS
     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES $$QDOC_INCLUDE_PATHS
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index d4f08835f1..7e9903d663 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -9,6 +9,9 @@ testcase_exceptions: CONFIG += exceptions
 # Set in qt_build_config.prf
 testcase_no_bundle: CONFIG -= app_bundle
 
+# cmdline may have been specified and not processed yet
+cmdline: CONFIG -= app_bundle
+
 # Allow testcases to mark themselves as not supporting high-DPI
 testcase_lowdpi {
     macos {