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

Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288

5 files changed, 28 insertions, 8 deletions

diff --git a/mkspecs/common/msvc-base.conf b/mkspecs/common/msvc-base.conf
index 1651cf5ded..d54b11507e 100644
--- a/mkspecs/common/msvc-base.conf
+++ b/mkspecs/common/msvc-base.conf
@@ -50,5 +50,5 @@ greaterThan(MSC_VER, 1899) {
     QMAKE_CFLAGS_WARN_ON += -w44456 -w44457 -w44458
     QMAKE_CFLAGS_AVX2   = -arch:AVX2
     QMAKE_CXXFLAGS     += -Zc:strictStrings -Zc:throwingNew
-    QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577
+    QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 -wd4467
 }
diff --git a/mkspecs/devices/linux-drive-cx-g++/qmake.conf b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
index c8e85e449c..985f8626ad 100644
--- a/mkspecs/devices/linux-drive-cx-g++/qmake.conf
+++ b/mkspecs/devices/linux-drive-cx-g++/qmake.conf
@@ -10,6 +10,10 @@
 #   -no-gcc-sysroot \
 #   -opengl es2
 
+# Note: This enables eglfs and wayland only. To enable xcb (with EGL
+# support) as well, add -qt-xcb and fix the SDK's X11 headers. See
+# QTBUG-55140.
+
 include(../common/linux_device_pre.conf)
 
 isEmpty(VIBRANTE_SDK_TOPDIR):error("You must pass -device-option VIBRANTE_SDK_TOPDIR=/path/to/sdk")
@@ -31,7 +35,10 @@ QMAKE_LFLAGS += \
     -Wl,-rpath-link,$$[QT_SYSROOT]/lib/aarch64-linux-gnu
 
 DISTRO_OPTS                  += aarch64
-COMPILER_FLAGS               += -mtune=cortex-a57.cortex-a53 -march=armv8-a -DWIN_INTERFACE_CUSTOM
+
+# Do not define WIN_INTERFACE_CUSTOM here. It is suitable for drm and
+# wayland, but not X11. Leave it to qt_egl_p.h instead.
+COMPILER_FLAGS               += -mtune=cortex-a57.cortex-a53 -march=armv8-a
 
 EGLFS_DEVICE_INTEGRATION = eglfs_kms_egldevice
 
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 05f97a5532..6b08ea3a1a 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -18,10 +18,15 @@ fq_qml_files = $$qmldir_file
 
 for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
 
-qml1_target: \
+load(qt_build_paths)
+
+qml1_target {
+    DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
     instbase = $$[QT_INSTALL_IMPORTS]
-else: \
+} else {
+    DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
     instbase = $$[QT_INSTALL_QML]
+}
 
 !qml1_target:static: CONFIG += builtin_resources
 
@@ -41,4 +46,13 @@ else: qmldir.files = $$qmldir_file
 qmldir.path = $$instbase/$$TARGETPATH
 INSTALLS += qmldir
 
-!prefix_build: COPIES += qmldir
+!debug_and_release|!build_all|CONFIG(release, debug|release) {
+    !prefix_build {
+        COPIES += qmldir
+    } else {
+        # For non-installed static builds, qmlimportscanner needs qmldir file in build dir
+        qmldir2build.files = $$qmldir_file
+        qmldir2build.path = $$DESTDIR
+        COPIES += qmldir2build
+    }
+}
diff --git a/mkspecs/features/uikit/device_destinations.sh b/mkspecs/features/uikit/device_destinations.sh
index af7cb91e85..b378d67500 100755
--- a/mkspecs/features/uikit/device_destinations.sh
+++ b/mkspecs/features/uikit/device_destinations.sh
@@ -44,6 +44,8 @@ echo "SIMULATOR_DEVICES = $booted_simulator"
 
 xcodebuild test -scheme $2 -destination 'id=0' -destination-timeout 1 2>&1| sed -n 's/{ \(platform:.*\) }/\1/p' | while read destination; do
     id=$(echo $destination | sed -n -E 's/.*id:([^ ,]+).*/\1/p')
+    [[ $id == *"placeholder"* ]] && continue
+
     echo $destination | tr ',' '\n' | while read keyval; do
         key=$(echo $keyval | cut -d ':' -f 1 | tr '[:lower:]' '[:upper:]')
         val=$(echo $keyval | cut -d ':' -f 2)
diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf
index 94451ea196..0ec065e35d 100644
--- a/mkspecs/features/uikit/sdk.prf
+++ b/mkspecs/features/uikit/sdk.prf
@@ -12,9 +12,6 @@ build_pass:simulator: \
 
 load(sdk)
 
-lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \
-    error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.")
-
 macx-xcode {
     sdk_path_device.name = "QMAKE_MAC_SDK_PATH[sdk=$${device.sdk}*]"
     sdk_path_device.value = $$xcodeSDKInfo(Path, $${device.sdk})