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

Conflicts:
	config.tests/arch/arch.cpp
	src/opengl/qgl_qpa.cpp
	src/widgets/kernel/qapplication.cpp

Change-Id: I80b442a4c2c9632743a5b5c7319ff201ec5bc4fd

5 files changed, 24 insertions, 29 deletions

diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index 78b484fdb5..e510c2d93c 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -74,6 +74,19 @@ else: ANDROID_ARCHITECTURE = arm
 NDK_TOOLCHAIN = $$NDK_TOOLCHAIN_PREFIX-$$NDK_TOOLCHAIN_VERSION
 NDK_TOOLCHAIN_PATH = $$NDK_ROOT/toolchains/$$NDK_TOOLCHAIN/prebuilt/$$NDK_HOST
 
+
+ANDROID_SDK_ROOT = $$(ANDROID_SDK_ROOT)
+isEmpty(ANDROID_SDK_ROOT): ANDROID_SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
+
+ANDROID_SDK_BUILD_TOOLS_REVISION = $$(ANDROID_BUILD_TOOLS_REVISION)
+isEmpty(ANDROID_SDK_BUILD_TOOLS_REVISION) {
+    SDK_BUILD_TOOLS_REVISIONS = $$files($$ANDROID_SDK_ROOT/build-tools/*)
+    for (REVISION, SDK_BUILD_TOOLS_REVISIONS) {
+        BASENAME = $$basename(REVISION)
+        greaterThan(BASENAME, $$ANDROID_SDK_BUILD_TOOLS_REVISION): ANDROID_SDK_BUILD_TOOLS_REVISION = $$BASENAME
+    }
+}
+
 CONFIG += $$ANDROID_PLATFORM
 ANDROID_PLATFORM_ROOT_PATH  = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/
 ANDROID_PLATFORM_PATH  = $$ANDROID_PLATFORM_ROOT_PATH/usr
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf
index 39f151f65d..54d887d088 100644
--- a/mkspecs/features/android/android_deployment_settings.prf
+++ b/mkspecs/features/android/android_deployment_settings.prf
@@ -10,9 +10,8 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-no-sdk {
     FILE_CONTENT += "   \"qt\": $$emitString($$[QT_INSTALL_PREFIX]),"
 
     # Settings from mkspecs/environment
-    isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT)
-    isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
-    FILE_CONTENT += "   \"sdk\": $$emitString($$SDK_ROOT),"
+    FILE_CONTENT += "   \"sdk\": $$emitString($$ANDROID_SDK_ROOT),"
+    FILE_CONTENT += "   \"sdkBuildToolsRevision\": $$emitString($$ANDROID_SDK_BUILD_TOOLS_REVISION),"
 
     isEmpty(NDK_ROOT): NDK_ROOT = $$(ANDROID_NDK_ROOT)
     isEmpty(NDK_ROOT): NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
index cb1de0b947..1de64b8821 100644
--- a/mkspecs/features/device_config.prf
+++ b/mkspecs/features/device_config.prf
@@ -5,7 +5,9 @@ DEVICE_PRI = $$[QT_HOST_DATA/get]/mkspecs/qdevice.pri
 exists($$DEVICE_PRI):include($$DEVICE_PRI)
 unset(DEVICE_PRI)
 
-isEmpty(CROSS_COMPILE) {
+host_build {
+    CROSS_COMPILE =
+} else: isEmpty(CROSS_COMPILE) {
     #this variable can be persisted via qmake -set CROSS_COMPILE /foo
     CROSS_COMPILE = $$[CROSS_COMPILE]
 }
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf
index 790724cec9..1c55b8974e 100644
--- a/mkspecs/features/java.prf
+++ b/mkspecs/features/java.prf
@@ -1,24 +1,10 @@
 TEMPLATE = lib
 android {
-    isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT)
-    isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
-
     API_VERSION_TO_USE = $$(ANDROID_API_VERSION)
     isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION
     isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-10
 
-    isEmpty(BUILD_TOOLS_REVISION) {
-        BUILD_TOOLS_REVISION = $$(ANDROID_BUILD_TOOLS_REVISION)
-        isEmpty(BUILD_TOOLS_REVISION) {
-            BUILD_TOOLS_REVISIONS = $$files($$SDK_ROOT/build-tools/*)
-            for (REVISION, BUILD_TOOLS_REVISIONS) {
-                BASENAME = $$basename(REVISION)
-                greaterThan(BASENAME, $$BUILD_TOOLS_REVISION): BUILD_TOOLS_REVISION = $$BASENAME
-            }
-        }
-    }
-
-    ANDROID_JAR_FILE = $$SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar
+    ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar
     !exists($$ANDROID_JAR_FILE) {
         error("The Path $$ANDROID_JAR_FILE does not exist. Make sure the ANDROID_SDK_ROOT and ANDROID_API_VERSION environment variables are correctly set.")
     }
@@ -69,12 +55,12 @@ android:!bundled_jar_file {
         # of the base sdk folder.
         # Doing it this way makes this logic more similar to the other platforms and
         # also means that our dx.bat is more like Google's dx.bat
-        DEX_BAT = $$SDK_ROOT/platform-tools/dx.bat
-        !exists($$DEX_BAT): DEX_BAT = $$SDK_ROOT/build-tools/$$BUILD_TOOLS_REVISION/dx.bat
+        DEX_BAT = $$ANDROID_SDK_ROOT/platform-tools/dx.bat
+        !exists($$DEX_BAT): DEX_BAT = $$ANDROID_SDK_ROOT/build-tools/$$ANDROID_SDK_BUILD_TOOLS_REVISION/dx.bat
         DEX_CMD = $$PWD/data/android/dx $$DEX_BAT
     } else {
-        DEX_CMD = $$SDK_ROOT/platform-tools/dx
-        !exists($$DEX_CMD): DEX_CMD = $$SDK_ROOT/build-tools/$$BUILD_TOOLS_REVISION/dx
+        DEX_CMD = $$ANDROID_SDK_ROOT/platform-tools/dx
+        !exists($$DEX_CMD): DEX_CMD = $$ANDROID_SDK_ROOT/build-tools/$$ANDROID_SDK_BUILD_TOOLS_REVISION/dx
         !exists($$DEX_CMD): error("The path $$DEX_CMD does not exist. Please set the environment variable ANDROID_BUILD_TOOLS_REVISION to the revision of the build tools installed in your Android SDK.")
     }
     QMAKE_LINK_SHLIB_CMD = $$DEX_CMD --dex --output $(TARGET) $$CLASS_DIR
diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf
index ab0a722628..0650adfe5e 100644
--- a/mkspecs/features/qt_headersclean.prf
+++ b/mkspecs/features/qt_headersclean.prf
@@ -13,16 +13,11 @@
 *-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef
 
 # Other nice flags
-*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wcast-align -Wchar-subscripts -Wpointer-arith -Wformat-security
+*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wchar-subscripts -Wpointer-arith -Wformat-security
 
 # Enable pedantic mode, but accept variadic macros and 'long long' usage.
 *-g++*: QMAKE_CXXFLAGS += -Wno-long-long -Wno-variadic-macros -pedantic-errors
 
-contains(QT_ARCH,arm)|contains(QT_ARCH,mips) {
-    # There are outstanding alignment issues in some container classes.
-    *-g++*:QMAKE_CXXFLAGS -= -Wcast-align
-}
-
 QMAKE_CXXFLAGS += -DQT_NO_CAST_TO_ASCII \
                   -DQT_NO_CAST_FROM_ASCII \
                   -DQT_STRICT_ITERATORS \