Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843

8 files changed, 29 insertions, 14 deletions

diff --git a/mkspecs/features/data/unix/findclasslist.pl b/mkspecs/features/data/unix/findclasslist.pl
index fb4357d0d4..b74b8b6a58 100644
--- a/mkspecs/features/data/unix/findclasslist.pl
+++ b/mkspecs/features/data/unix/findclasslist.pl
@@ -55,7 +55,7 @@ while (<STDIN>) {
     my $comment = "    /* $1 */";
     while (my $line = <HDR>) {
         # Match a struct or class declaration, but not a forward declaration
-        $line =~ /^(?:struct|class) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next;
+        $line =~ /^(?:struct|class|namespace) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next;
         print $comment if $comment;
         printf "    *%d%s*;\n", length $1, $1;
         $comment = 0;
diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf
index 5d06198ae4..f40cc99172 100644
--- a/mkspecs/features/exclusive_builds.prf
+++ b/mkspecs/features/exclusive_builds.prf
@@ -1,12 +1,9 @@
 
-defineTest(addExclusiveBuilds) {
-    lessThan(ARGC, 2): \
-        error("addExclusiveBuilds() requires at least two arguments")
-
-    !$$join(ARGS, _and_):!fix_output_dirs: \
+defineTest(addExclusiveBuildsProper) {
+    !$$1:!fix_output_dirs: \
         return(true)
 
-    for(build, ARGS) {
+    for(build, 2) {
         isEmpty($${build}.name) {
             $${build}.name = $$title($$build)
             export($${build}.name)
@@ -20,7 +17,7 @@ defineTest(addExclusiveBuilds) {
             export($${build}.dir_affix)
         }
 
-        $${build}.exclusive = $$ARGS
+        $${build}.exclusive = $$2
         export($${build}.exclusive)
 
         QMAKE_EXCLUSIVE_BUILDS += $$build
@@ -33,6 +30,13 @@ defineTest(addExclusiveBuilds) {
     return(true)
 }
 
+defineTest(addExclusiveBuilds) {
+    lessThan(ARGC, 2): \
+        error("addExclusiveBuilds() requires at least two arguments")
+
+    addExclusiveBuildsProper($$join(ARGS, _and_), $$ARGS)
+}
+
 # Default directories to process
 QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR
 QMAKE_DIR_REPLACE_SANE += QGLTF_DIR
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf
index b3b1d4be99..ed1ad8ad38 100644
--- a/mkspecs/features/mac/objective_c.prf
+++ b/mkspecs/features/mac/objective_c.prf
@@ -1,6 +1,7 @@
 
 # Objective-C/C++ sources go in SOURCES, like all other sources
 SOURCES += $$OBJECTIVE_SOURCES
+unset(OBJECTIVE_SOURCES)
 
 # Strip C/C++ flags from QMAKE_OBJECTIVE_CFLAGS just in case
 QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
@@ -8,3 +9,4 @@ QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
 # Add Objective-C/C++ flags to C/C++ flags, the compiler can handle it
 QMAKE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
 QMAKE_CXXFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
+unset(QMAKE_OBJECTIVE_CFLAGS)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 9d4a9ad5c9..1756ca35bf 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -79,7 +79,7 @@ moc_source.CONFIG = no_link moc_verify
 moc_source.dependency_type = TYPE_C
 moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
-moc_source.input = SOURCES OBJECTIVE_SOURCES
+moc_source.input = SOURCES
 moc_source.name = MOC ${QMAKE_FILE_IN}
 moc_source.depends += $$WIN_INCLUDETEMP $$moc_predefs.output
 silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index fb814b547f..9bf0d2fad3 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -292,7 +292,8 @@ contains(TEMPLATE, .*app) {
     autoplugs =
     for (qtmod, qt_module_deps) {
         for (ptype, QT.$${qtmod}.plugin_types) {
-            isEmpty(QTPLUGIN.$$ptype) {
+            nptype = $$replace(ptype, [-/], _)
+            isEmpty(QTPLUGIN.$$nptype) {
                 for (plug, QT_PLUGINS) {
                     equals(QT_PLUGIN.$${plug}.TYPE, $$ptype) {
                         for (dep, QT_PLUGIN.$${plug}.EXTENDS) {
@@ -305,7 +306,7 @@ contains(TEMPLATE, .*app) {
                     }
                 }
             } else {
-                plug = $$eval(QTPLUGIN.$$ptype)
+                plug = $$eval(QTPLUGIN.$$nptype)
                 !equals(plug, -): \
                     autoplugs += $$plug
             }
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 30f7be640d..57160d11eb 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -101,7 +101,7 @@ defineReplace(qtExportLibsForModule) {
     else: \
         module_config =
     !isEmpty(MODULE_PLUGIN_TYPES): \
-        module_plugtypes = "QT.$${MODULE_ID}.plugin_types = $$replace(MODULE_PLUGIN_TYPES, /.*$, )"
+        module_plugtypes = "QT.$${MODULE_ID}.plugin_types = $$replace(MODULE_PLUGIN_TYPES, /[^.]+\\.[^.]+$, )"
     else: \
         module_plugtypes =
     !isEmpty(MODULE_MASTER_HEADER): \
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 6e23e23a6a..8f1c5280b8 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -90,3 +90,11 @@ macx-xcode {
 
     QMAKE_PCH_ARCHS = $$VALID_ARCHS
 }
+
+!xcodebuild:equals(TEMPLATE, app):!isEmpty(QMAKE_INFO_PLIST) {
+    # Only link in photo library support if Info.plist contains
+    # NSPhotoLibraryUsageDescription. Otherwise it will be rejected from AppStore.
+    plist_path = $$absolute_path($$QMAKE_INFO_PLIST, $$_PRO_FILE_PWD_)
+    system("/usr/libexec/PlistBuddy -c 'Print NSPhotoLibraryUsageDescription' $$system_quote($$plist_path) &>/dev/null"): \
+        QTPLUGIN += qiosnsphotolibrarysupport
+}
diff --git a/mkspecs/features/uikit/resolve_config.prf b/mkspecs/features/uikit/resolve_config.prf
index 868813dcbd..e3c9ae23a9 100644
--- a/mkspecs/features/uikit/resolve_config.prf
+++ b/mkspecs/features/uikit/resolve_config.prf
@@ -11,7 +11,7 @@ load(resolve_config)
 !macx-xcode:xcodebuild {
     # Switch the order to make sure that the first Makefile target is the right one
     !qtConfig(simulator_and_device):contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*): \
-        addExclusiveBuilds(simulator, device)
+        addExclusiveBuildsProper(simulator_and_device, simulator device)
     else: \
-        addExclusiveBuilds(device, simulator)
+        addExclusiveBuildsProper(simulator_and_device, device simulator)
 }