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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

7 files changed, 39 insertions, 15 deletions

diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index 5e8a97c9d7..c8145ae66b 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -9,16 +9,20 @@ include(../common/linux.conf)
 include(../common/gcc-base-unix.conf)
 include(../common/android-base-head.conf)
 
-QMAKE_CC                = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
-QMAKE_CXX               = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-g++
+QMAKE_CC                = $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CROSS_COMPILE}g++
 QMAKE_LINK              = $$QMAKE_CXX
 
 ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ARCH
 ANDROID_STDCPP_PATH            = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libgnustl_shared.so
 ANDROID_CXX_STL_LIBS           = -lgnustl_shared -lgcc
 
-QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \
-                -isystem $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include \
+exists($$NDK_ROOT/sysroot/usr/include): \
+        QMAKE_CFLAGS += --sysroot=$$NDK_ROOT/sysroot \
+                        -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX
+else:   QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH
+
+QMAKE_CFLAGS += -isystem $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/include \
                 -isystem $$ANDROID_SOURCES_CXX_STL_LIBDIR/include
 
 equals(ANDROID_TARGET_ARCH, armeabi)|equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
diff --git a/mkspecs/common/android-base-head.conf b/mkspecs/common/android-base-head.conf
index 90cc71247a..9be6111915 100644
--- a/mkspecs/common/android-base-head.conf
+++ b/mkspecs/common/android-base-head.conf
@@ -74,3 +74,4 @@ ANDROID_PLATFORM_PATH  = $$ANDROID_PLATFORM_ROOT_PATH/usr
 equals(ANDROID_TARGET_ARCH, x86_64)|equals(ANDROID_TARGET_ARCH, mips64): \
     QMAKE_ANDROID_PLATFORM_LIBDIR = $${QMAKE_ANDROID_PLATFORM_LIBDIR}64
 
+CROSS_COMPILE = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-
diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf
index 3472dfdf77..160caf011f 100644
--- a/mkspecs/common/android-base-tail.conf
+++ b/mkspecs/common/android-base-tail.conf
@@ -57,14 +57,14 @@ QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
 
 # modifications to linux.conf
-QMAKE_AR                = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-ar cqs
-QMAKE_OBJCOPY           = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-objcopy
-QMAKE_NM                = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-nm -P
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_NM                = $${CROSS_COMPILE}nm -P
 
 QMAKE_STRIP             =
-#$$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-strip
+#$${CROSS_COMPILE}strip
 
-QMAKE_RANLIB            = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-ranlib
+QMAKE_RANLIB            = $${CROSS_COMPILE}ranlib
 
 QMAKE_INCDIR_POST       =
 QMAKE_LIBDIR_POST       = $$ANDROID_SOURCES_CXX_STL_LIBDIR
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 48b05b3471..37194b2eb8 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -45,7 +45,7 @@ if(gcc|intel_icl|msvc):!rim_qcc:!uikit:!no_moc_predefs:if(!macos|count(QMAKE_APP
 
 defineReplace(mocCmdBase) {
     !isEmpty(WIN_INCLUDETEMP) {
-        incvar = @$$WIN_INCLUDETEMP
+        incvar = @$$shell_quote($$WIN_INCLUDETEMP)
     } else {
         incvar =
         for (inc, MOC_INCLUDEPATH): \
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 65574d2635..b8e397cda3 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -74,10 +74,10 @@ warnings_are_errors:warning_clean {
     # compiler.
     clang {
         # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4,7.0-7.3
-        # Regular clang 3.3-3.9, 4.0
+        # Regular clang 3.x-5.0
         apple_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION}
         reg_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION}
-        contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]|7\\.[0123]")|contains(reg_ver, "3\\.[3-9]|4\\.0") {
+        contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]|7\\.[0123]")|contains(reg_ver, "[34]\\.|5\\.0") {
             QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR
         }
     } else:intel_icc:linux {
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 21c18c7f7b..35175f1744 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -232,17 +232,17 @@ QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
     QMAKE_COMPILER_DEFINES += __INTEL_COMPILER=$$QMAKE_ICC_VER __INTEL_COMPILER_UPDATE=$$QMAKE_ICC_UPDATE_VER
 !isEmpty(QMAKE_APPLE_CC): \
     QMAKE_COMPILER_DEFINES += __APPLE_CC__=$$QMAKE_APPLE_CC
-!isEmpty(QT_APPLE_CLANG_MAJOR_VERSION): \
+!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION): \
     QMAKE_COMPILER_DEFINES += __clang__ \
         __clang_major__=$$QMAKE_APPLE_CLANG_MAJOR_VERSION \
         __clang_minor__=$$QMAKE_APPLE_CLANG_MINOR_VERSION \
         __clang_patchlevel__=$$QMAKE_APPLE_CLANG_PATCH_VERSION
-!isEmpty(QT_CLANG_MAJOR_VERSION): \
+!isEmpty(QMAKE_CLANG_MAJOR_VERSION): \
     QMAKE_COMPILER_DEFINES += __clang__ \
         __clang_major__=$$QMAKE_CLANG_MAJOR_VERSION \
         __clang_minor__=$$QMAKE_CLANG_MINOR_VERSION \
         __clang_patchlevel__=$$QMAKE_CLANG_PATCH_VERSION
-!isEmpty(QT_GCC_MAJOR_VERSION): \
+!isEmpty(QMAKE_GCC_MAJOR_VERSION): \
     QMAKE_COMPILER_DEFINES += \
         __GNUC__=$$QMAKE_GCC_MAJOR_VERSION \
         __GNUC_MINOR__=$$QMAKE_GCC_MINOR_VERSION \
diff --git a/mkspecs/features/unix/ccache.prf b/mkspecs/features/unix/ccache.prf
new file mode 100644
index 0000000000..d5739d3eab
--- /dev/null
+++ b/mkspecs/features/unix/ccache.prf
@@ -0,0 +1,19 @@
+macx-xcode: return()
+
+darwin: load(sdk)
+
+ccache_prefix = ccache
+
+precompile_header {
+    CCACHE_SLOPPINESS += pch_defines time_macros
+
+    ccache_prefix = \
+        CCACHE_SLOPPINESS=\"$$join(CCACHE_SLOPPINESS, ',')\$${CCACHE_SLOPPINESS+,\$$CCACHE_SLOPPINESS}\" \
+        # Make sure we build sources directly, not from their preprocessed version,
+        # otherwise precompiled headers will not be used during cache misses.
+        CCACHE_CPP2=true \
+        $$ccache_prefix
+}
+
+for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_LINK_C)): \
+    $$tool = $$ccache_prefix $$eval($$tool)