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

 Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b

9 files changed, 44 insertions, 70 deletions

diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index 6122a37213..5800aaa5b4 100644
--- a/mkspecs/common/clang.conf
+++ b/mkspecs/common/clang.conf
@@ -4,8 +4,8 @@
 
 QMAKE_COMPILER          = gcc clang llvm   # clang pretends to be gcc
 
-QMAKE_CC                = clang
-QMAKE_CXX               = clang++
+QMAKE_CC                = $${CROSS_COMPILE}clang
+QMAKE_CXX               = $${CROSS_COMPILE}clang++
 
 QMAKE_LINK_C            = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 5208379f9a..61bea952b2 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -33,12 +33,19 @@ QMAKE_LIBS_DYNLOAD      =
 QMAKE_LIBS_OPENGL       = -framework OpenGL -framework AGL
 QMAKE_LIBS_THREAD       =
 
+QMAKE_INCDIR_WAYLAND    =
+QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
+QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
+QMAKE_LIBDIR_WAYLAND    =
+QMAKE_DEFINES_WAYLAND   =
+QMAKE_WAYLAND_SCANNER   = wayland-scanner
+
 QMAKE_ACTOOL            = actool
 
 QMAKE_DSYMUTIL          = dsymutil
-QMAKE_STRIP             = strip
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
 QMAKE_STRIPFLAGS_LIB   += -S -x
 
-QMAKE_AR                = ar cq
-QMAKE_RANLIB            = ranlib -s
-QMAKE_NM                = nm -P
+QMAKE_AR                = $${CROSS_COMPILE}ar cq
+QMAKE_RANLIB            = $${CROSS_COMPILE}ranlib -s
+QMAKE_NM                = $${CROSS_COMPILE}nm -P
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index ccd809abf3..3fb55c9d81 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -100,11 +100,16 @@ greaterThan(QMAKE_MSC_VER, 1909) {
     # API is used in direct2d, but also in multimedia, positioning and sensors.
     # We can try again with a later version of Visual Studio.
     # QMAKE_CXXFLAGS_STRICTCXX = -permissive-
+
     # MSVC partially supports the following, but '__cplusplus' definition is set
     # as for C++98 until MSVC fully conforms with C++14, see
     # https://developercommunity.visualstudio.com/content/problem/139261/msvc-incorrectly-defines-cplusplus.html
-    # QMAKE_CXXFLAGS_CXX14 = -std:c++14
-    # QMAKE_CXXFLAGS_CXX1Z = -std:c++latest
+    # Support became available in MSVC 2017 15.7:
+    greaterThan(QMAKE_MSC_VER, 1913) {
+        QMAKE_CXXFLAGS      += -Zc:__cplusplus
+        QMAKE_CXXFLAGS_CXX14 = -std:c++14
+        QMAKE_CXXFLAGS_CXX1Z = -std:c++17
+    }
 }
 
 greaterThan(QMAKE_MSC_VER, 1910) {
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 07a9b1c401..1f2f1ff2de 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -11,7 +11,7 @@ CONFIG = \
     testcase_targets import_plugins import_qpa_plugin \
     $$CONFIG
 
-!build_pass:defined(QT_EDITION, var):!equals(QT_EDITION, "OpenSource"):!equals(QT_EDITION, "Preview") {
+!build_pass:!isEmpty(QT_LICHECK) {
     #
     # call license checker (but cache result for one day)
     #
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 37194b2eb8..5c7745e5bb 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -57,7 +57,7 @@ defineReplace(mocCmdBase) {
     msvc: RET += --compiler-flavor=msvc
 
     isEmpty(MOC_PREDEF_FILE): RET += $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
-    else: RET += --include $$shell_quote($$moc_predefs.output)
+    else: RET += --include $$shell_quote($$absolute_path($$moc_predefs.output, $$OUT_PWD))
 
     RET += $$incvar $$QMAKE_MOC_OPTIONS
     return($$RET)
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 8c891c654b..a61cae9ece 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -158,7 +158,7 @@ defineTest(qtConfCommandline_optionalString) {
     nextok = $${3}
     isEmpty(val) {
         $$nextok: val = $$qtConfPeekNextCommandlineArg()
-        contains(val, "^-.*|[A-Z_]+=.*")|isEmpty(val): \
+        contains(val, "^-.*|[A-Z0-9_]+=.*")|isEmpty(val): \
             val = "yes"
         else: \
             val = $$qtConfGetNextCommandlineArg()
@@ -233,9 +233,9 @@ defineTest(qtConfParseCommandLine) {
         $$didCustomCall: \
             next()
 
-        contains(c, "([A-Z_]+)=(.*)") {
-            opt = $$replace(c, "^([A-Z_]+)=(.*)", "\\1")
-            val = $$replace(c, "^([A-Z_]+)=(.*)", "\\2")
+        contains(c, "([A-Z0-9_]+)=(.*)") {
+            opt = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\1")
+            val = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\2")
             for (cc, allConfigs) {
                 var = $$eval($${cc}.commandline.assignments.$${opt})
                 !isEmpty(var): \
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index bf90adcf1e..40528a65e2 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -35,9 +35,9 @@ CONFIG += relative_qt_rpath  # Qt's plugins should be relocatable
 # Qt libraries should only use Application Extension safe APIs
 darwin:!no_app_extension_api_only: CONFIG += app_extension_api_only
 
-CONFIG(static, static|shared)|prefix_build {
-    isEmpty(MODULE): MODULE = $$basename(TARGET)
+isEmpty(MODULE): MODULE = $$basename(TARGET)
 
+CONFIG(static, static|shared)|prefix_build {
     mod_work_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
     force_independent: \
         mod_inst_pfx = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst
diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
index 9166ae7750..2360917a3b 100644
--- a/mkspecs/features/wayland-scanner.prf
+++ b/mkspecs/features/wayland-scanner.prf
@@ -14,54 +14,14 @@
 
 isEmpty(QMAKE_WAYLAND_SCANNER):error("QMAKE_WAYLAND_SCANNER not defined for this mkspec")
 
-defineReplace(waylandScannerHeaderFiles) {
-    side = $$1
-    path = $$2
-    isEqual(side, "server"): \
-        sources_list = $$WAYLANDSERVERSOURCES $$WAYLANDSERVERSOURCES_SYSTEM
-    else: \
-        sources_list = $$WAYLANDCLIENTSOURCES $$WAYLANDCLIENTSOURCES_SYSTEM
-    wayland_header_files_for_side =
-    for(file, sources_list) {
-        basenameFile = $$basename(file)
-        basenameFile ~= s,\\.xml$,,
-        wayland_header_files_for_side += $$path/wayland-$$basenameFile-$$side-protocol$${first(QMAKE_EXT_H)}
-        isEqual(side, "server"): \
-            wayland_header_files_for_side += $$path/qwayland-server-$$basenameFile$${first(QMAKE_EXT_H)}
-        else: \
-            wayland_header_files_for_side += $$path/qwayland-$$basenameFile$${first(QMAKE_EXT_H)}
-    }
-    return($$wayland_header_files_for_side)
-}
-
-qt_install_headers {
-    header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
-
-    header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
-    !isEmpty(header_files_client) {
-        wayland_generated_client_headers.files = $$header_files_client
-        wayland_generated_client_headers.path = $$private_headers.path
-        wayland_generated_client_headers.CONFIG = no_check_exist
-        INSTALLS += wayland_generated_client_headers
-        WAYLAND_CLIENT_HEADER_DEST = $$header_dest/
-        WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private
-    }
-
-    header_files_server = $$waylandScannerHeaderFiles(server, $$header_dest)
-    !isEmpty(header_files_server) {
-        wayland_generated_server_headers.files = $$header_files_server
-        wayland_generated_server_headers.path = $$private_headers.path
-        wayland_generated_server_headers.CONFIG = no_check_exist
-        INSTALLS += wayland_generated_server_headers
-        WAYLAND_SERVER_HEADER_DEST = $$header_dest/
-        WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private
-    }
+!isEmpty(MODULE_INCNAME) {
+    WAYLAND_INCLUDE_DIR = $$MODULE_INCNAME/private
 }
 
 wayland_server_header.name = wayland ${QMAKE_FILE_BASE}
 wayland_server_header.input = WAYLANDSERVERSOURCES WAYLANDSERVERSOURCES_SYSTEM
 wayland_server_header.variable_out = HEADERS
-wayland_server_header.output = $${WAYLAND_SERVER_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
+wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
 wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
 silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
 QMAKE_EXTRA_COMPILERS += wayland_server_header
@@ -69,7 +29,7 @@ QMAKE_EXTRA_COMPILERS += wayland_server_header
 wayland_client_header.name = wayland ${QMAKE_FILE_BASE}
 wayland_client_header.input = WAYLANDCLIENTSOURCES WAYLANDCLIENTSOURCES_SYSTEM
 wayland_client_header.variable_out = HEADERS
-wayland_client_header.output = $${WAYLAND_CLIENT_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
+wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
 wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
 silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
 QMAKE_EXTRA_COMPILERS += wayland_client_header
@@ -87,35 +47,35 @@ qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
 qtwayland_client_header.name = qtwayland ${QMAKE_FILE_BASE}
 qtwayland_client_header.input = WAYLANDCLIENTSOURCES WAYLANDCLIENTSOURCES_SYSTEM
 qtwayland_client_header.variable_out = HEADERS
-qtwayland_client_header.depends += $$QMAKE_QTWAYLANDSCANNER_EXE $${WAYLAND_CLIENT_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
-qtwayland_client_header.output = $${WAYLAND_CLIENT_HEADER_DEST}qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} $$WAYLAND_CLIENT_INCLUDE_DIR > ${QMAKE_FILE_OUT}
+qtwayland_client_header.depends += $$QMAKE_QTWAYLANDSCANNER_EXE wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
+qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} $$WAYLAND_INCLUDE_DIR > ${QMAKE_FILE_OUT}
 silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
 QMAKE_EXTRA_COMPILERS += qtwayland_client_header
 
 qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE}
 qtwayland_client_code.input = WAYLANDCLIENTSOURCES WAYLANDCLIENTSOURCES_SYSTEM
 qtwayland_client_code.variable_out = SOURCES
-qtwayland_client_code.depends += $$QMAKE_QTWAYLANDSCANNER_EXE $${WAYLAND_CLIENT_HEADER_DEST}qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_client_code.depends += $$QMAKE_QTWAYLANDSCANNER_EXE qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
 qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp
-qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} $$WAYLAND_CLIENT_INCLUDE_DIR > ${QMAKE_FILE_OUT}
+qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} $$WAYLAND_INCLUDE_DIR > ${QMAKE_FILE_OUT}
 silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
 QMAKE_EXTRA_COMPILERS += qtwayland_client_code
 
 qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE}
 qtwayland_server_header.input = WAYLANDSERVERSOURCES WAYLANDSERVERSOURCES_SYSTEM
 qtwayland_server_header.variable_out = HEADERS
-qtwayland_server_header.depends += $$QMAKE_QTWAYLANDSCANNER_EXE $${WAYLAND_SERVER_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
-qtwayland_server_header.output = $${WAYLAND_SERVER_HEADER_DEST}qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} $$WAYLAND_SERVER_INCLUDE_DIR > ${QMAKE_FILE_OUT}
+qtwayland_server_header.depends += $$QMAKE_QTWAYLANDSCANNER_EXE wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
+qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} $$WAYLAND_INCLUDE_DIR > ${QMAKE_FILE_OUT}
 silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
 QMAKE_EXTRA_COMPILERS += qtwayland_server_header
 
 qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE}
 qtwayland_server_code.input = WAYLANDSERVERSOURCES WAYLANDSERVERSOURCES_SYSTEM
 qtwayland_server_code.variable_out = SOURCES
-qtwayland_server_code.depends += $$QMAKE_QTWAYLANDSCANNER_EXE $${WAYLAND_SERVER_HEADER_DEST}qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
+qtwayland_server_code.depends += $$QMAKE_QTWAYLANDSCANNER_EXE qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
 qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
-qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} $$WAYLAND_SERVER_INCLUDE_DIR > ${QMAKE_FILE_OUT}
+qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} $$WAYLAND_INCLUDE_DIR > ${QMAKE_FILE_OUT}
 silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
 QMAKE_EXTRA_COMPILERS += qtwayland_server_code
diff --git a/mkspecs/macx-xcode/WorkspaceSettings.xcsettings b/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
index 08de0be8d3..a3f43a8b38 100644
--- a/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
+++ b/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
@@ -2,6 +2,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>BuildSystemType</key>
+	<string>Original</string>
 	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
 	<false/>
 </dict>