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

Conflicts:
	src/testlib/qtestblacklist.cpp
	src/widgets/accessible/qaccessiblewidgets.cpp

Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c

10 files changed, 54 insertions, 20 deletions

diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index e16938b7b8..e638af6b6a 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STL_OFF  =
 QMAKE_CXXFLAGS_RTTI_ON  = -GR
 QMAKE_CXXFLAGS_RTTI_OFF =
 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -D_HAS_EXCEPTIONS=0
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
 QMAKE_INCDIR            =
 
@@ -115,6 +115,7 @@ greaterThan(MSC_VER, 1599) {
 
 greaterThan(MSC_VER, 1699) {
     # Visual Studio 2012 (11.0) / Visual C++ 17.0 and up
+    QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -D_HAS_EXCEPTIONS=0
     QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE@QMAKE_SUBSYSTEM_SUFFIX@
     QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS@QMAKE_SUBSYSTEM_SUFFIX@
     QT_CONFIG          += c++11
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index fd639b10ad..b40e1391ac 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -59,7 +59,9 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         module_rundep = "QT.$${MODULE_ID}.run_depends = $$replace(QT_PRIVATE, -private$, _private)"
     else: \
         module_rundep =
-    static: \
+    equals(TEMPLATE, aux): \
+        module_build_type = no_link
+    else:static: \
         module_build_type = staticlib
     else:mac:contains(QT_CONFIG, qt_framework): \
         module_build_type = lib_bundle
@@ -122,7 +124,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         "" \
         "QT_MODULES += $$MODULE"
     write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.")
-    !internal_module {
+    !internal_module:!no_private_module {
         module_build_type += internal_module no_link
         MODULE_PRIVATE_PRI_CONT = \
             "QT.$${MODULE}_private.VERSION = $${VERSION}" \
@@ -158,7 +160,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
             "QT_MODULE_PLUGIN_BASE = $$val_escape(MODULE_BASE_OUTDIR)/plugins" \
             "include($$val_escape(MODULE_PRI))" \
             "QT.$${MODULE_ID}.priority = 1"
-        !internal_module: MODULE_FWD_PRI_CONT += \
+        !internal_module:!no_private_module: MODULE_FWD_PRI_CONT += \
             "include($$val_escape(MODULE_PRIVATE_PRI))" \
             "QT.$${MODULE}_private.priority = 1"
         MODULE_FWD_PRI_CONT += $$MODULE_FWD_PRI_CONT_SUFFIX
diff --git a/mkspecs/features/win32/dumpcpp.prf b/mkspecs/features/win32/dumpcpp.prf
index af6387bed6..3da54fb66d 100644
--- a/mkspecs/features/win32/dumpcpp.prf
+++ b/mkspecs/features/win32/dumpcpp.prf
@@ -11,7 +11,7 @@ dumpcpp_decl.CONFIG += no_link
 QMAKE_EXTRA_COMPILERS += dumpcpp_decl
 
 
-dumpcpp_impl.commands = $$QMAKE_DUMPCPP -donothing
+dumpcpp_impl.commands = $$escape_expand(\\n)    # dummy command
 dumpcpp_impl.output = ${QMAKE_FILE_BASE}.cpp
 dumpcpp_impl.input = TYPELIBS
 dumpcpp_impl.variable_out = SOURCES
diff --git a/mkspecs/features/win32/idcidl.prf b/mkspecs/features/win32/idcidl.prf
index d70691fd40..a688b3ff41 100644
--- a/mkspecs/features/win32/idcidl.prf
+++ b/mkspecs/features/win32/idcidl.prf
@@ -46,7 +46,8 @@ contains(TEMPLATE, "vc.*") {
         QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDL "$${ACTIVEQT_OUTPUT}.idl" /nologo /tlb "$${ACTIVEQT_TLBOUT}"$$ACTIVEQT_NEWLINE)
         message("No rc-file linked into project; type library will be a separate file.")
     }
-    QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /regserver)
+    !qaxserver_no_register: \
+        QMAKE_POST_LINK += $$quote($$ACTIVEQT_IDC $${ACTIVEQT_TARGET} /regserver)
     QMAKE_CLEAN += $${ACTIVEQT_OUTPUT}.idl $${ACTIVEQT_OUTPUT}.tlb
 }
 
diff --git a/mkspecs/features/xctest.prf b/mkspecs/features/xctest.prf
new file mode 100644
index 0000000000..4b84682df7
--- /dev/null
+++ b/mkspecs/features/xctest.prf
@@ -0,0 +1,6 @@
+equals(TEMPLATE, app) {
+    load(sdk)
+    # Make the XCTest framework available. This is normally handled automatically
+    # by Xcode based on heuristics, but we need to explicitly link to XCTest.
+    QMAKE_LFLAGS += -F$${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks -weak_framework XCTest
+}
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 0525dc15e7..c9d3a5d85b 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -43,9 +43,6 @@ equals(TEMPLATE, app) {
             QMAKE_EXTRA_COMPILERS =
 
             !build_pass {
-                # Prefer debug and simulator as default test target
-                testcase: CONFIG += debug iphonesimulator
-
                 CONFIG += debug_and_release
                 load(resolve_config)
 
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf
index 697eb0ed60..9e6b486c6e 100644
--- a/mkspecs/macx-ios-clang/features/qt.prf
+++ b/mkspecs/macx-ios-clang/features/qt.prf
@@ -33,19 +33,20 @@ equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) {
         # called 'qt_main' now.
 
         macx-xcode {
-            objects_dir = "${OBJECT_FILE_DIR}-${CURRENT_VARIANT}"
-            archs = "${ARCHS}"
+            objects_dir = "\"${OBJECT_FILE_DIR}-${CURRENT_VARIANT}\""
+            archs = "\"${ARCHS}\""
         } else {
-            objects_dir = $$OBJECTS_DIR
-            isEmpty(objects_dir): \
+            isEmpty(OBJECTS_DIR): \
                 objects_dir = .
-            archs = "$$QMAKE_IOS_DEVICE_ARCHS $$QMAKE_IOS_SIMULATOR_ARCHS"
+            else: \
+                objects_dir = $$shell_quote($$OBJECTS_DIR)
+            archs = $$shell_quote($$QMAKE_IOS_DEVICE_ARCHS $$QMAKE_IOS_SIMULATOR_ARCHS)
         }
 
         !isEmpty(QMAKE_PRE_LINK): \
             QMAKE_PRE_LINK += ";"
 
-        QMAKE_PRE_LINK += $$QMAKESPEC/rename_main.sh $${objects_dir} \"$${archs}\"
+        QMAKE_PRE_LINK += $$shell_quote($$QMAKESPEC/rename_main.sh) $$objects_dir $$archs
     }
 }
 
diff --git a/mkspecs/macx-ios-clang/rename_main.sh b/mkspecs/macx-ios-clang/rename_main.sh
index b7916e1d56..1547f5f75c 100755
--- a/mkspecs/macx-ios-clang/rename_main.sh
+++ b/mkspecs/macx-ios-clang/rename_main.sh
@@ -38,9 +38,11 @@ if [ $# -ne 2 ]; then
 else
     arch_paths=""
     for a in $2; do
-        arch_paths="$arch_paths $1/$a"
+        arch_paths="$arch_paths
+$1/$a"
     done
-    for f in $(find $arch_paths -name '*.o'); do
+    for f in $(IFS="
+"; find $arch_paths -name '*.o'); do
         # Skip object files without the _main symbol
         nm $f 2>/dev/null | grep -q 'T _main$' || continue
 
diff --git a/mkspecs/macx-xcode/QtTest.plist b/mkspecs/macx-xcode/QtTest.plist
new file mode 100644
index 0000000000..41dddb1a53
--- /dev/null
+++ b/mkspecs/macx-xcode/QtTest.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.qt.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/mkspecs/macx-xcode/default.xcscheme b/mkspecs/macx-xcode/default.xcscheme
index ac21df17f3..4a16fefca0 100644
--- a/mkspecs/macx-xcode/default.xcscheme
+++ b/mkspecs/macx-xcode/default.xcscheme
@@ -32,9 +32,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "@TARGET_PBX_KEY@"
-               BuildableName = "@QMAKE_ORIG_TARGET@"
-               BlueprintName = "@QMAKE_ORIG_TARGET@"
+               BlueprintIdentifier = "@TEST_BUNDLE_PBX_KEY@"
+               BuildableName = "Qt Test"
+               BlueprintName = "Qt Test"
                ReferencedContainer = "container:@QMAKE_ORIG_TARGET@.xcodeproj">
             </BuildableReference>
          </TestableReference>