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

Conflicts:
	doc/global/template/style/online.css
	mkspecs/android-g++/qmake.conf

Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61

8 files changed, 45 insertions, 31 deletions

diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index ccf1cd804b..659ce46b9e 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -114,9 +114,9 @@ equals(ANDROID_TARGET_ARCH, x86_64)|equals(ANDROID_TARGET_ARCH, mips64): \
 QMAKE_CC                = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
 
 equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
-    QMAKE_CFLAGS = -Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack
+    QMAKE_CFLAGS = -Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack -fno-builtin-memmove
 else: equals(ANDROID_TARGET_ARCH, armeabi): \
-    QMAKE_CFLAGS = -Wno-psabi -march=armv5te -mtune=xscale -msoft-float   -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack
+    QMAKE_CFLAGS = -Wno-psabi -march=armv5te -mtune=xscale -msoft-float   -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -DANDROID -Wa,--noexecstack -fno-builtin-memmove
 else: equals(ANDROID_TARGET_ARCH, arm64-v8a): \
     QMAKE_CFLAGS = -ffunction-sections -funwind-tables -fstack-protector -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 -DANDROID -Wa,--noexecstack
 else: equals(ANDROID_TARGET_ARCH, x86): \
diff --git a/mkspecs/features/link_ltcg.prf b/mkspecs/features/link_ltcg.prf
new file mode 100644
index 0000000000..537021f11b
--- /dev/null
+++ b/mkspecs/features/link_ltcg.prf
@@ -0,0 +1,18 @@
+gcc {
+    # When doing link-time code generation, we need to pass the compiler
+    # flags during linking the stage too. This file is processed after
+    # default_post.prf, so the QMAKE_CXXFLAGS already contains
+    # QMAKE_CXXFLAGS_DEBUG or _RELEASE.
+    use_c_linker {
+        # use_c_linker.prf is in effect, use the C flags
+        QMAKE_LFLAGS_LTCG += $$QMAKE_CFLAGS $$QMAKE_CFLAGS_LTCG
+        QMAKE_LFLAGS_APP += $$QMAKE_CFLAGS_APP
+        QMAKE_LFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
+        QMAKE_LFLAGS_PLUGIN += $$QMAKE_CFLAGS_SHLIB
+    } else {
+        QMAKE_LFLAGS_LTCG = $$QMAKE_CXXFLAGS $$QMAKE_LFLAGS_LTCG
+        QMAKE_LFLAGS_APP += $$QMAKE_CXXFLAGS_APP
+        QMAKE_LFLAGS_SHLIB += $$QMAKE_CXXFLAGS_SHLIB
+        QMAKE_LFLAGS_PLUGIN += $$QMAKE_CFLAGS_SHLIB
+    }
+}
diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
index b418135014..b0765a85c3 100644
--- a/mkspecs/features/ltcg.prf
+++ b/mkspecs/features/ltcg.prf
@@ -31,23 +31,9 @@ CONFIG(release, debug|release) {
             QMAKE_CXXFLAGS_LTCG =
             QMAKE_LFLAGS_LTCG =
         }
-
-        # When doing link-time code generation, we need to pass the compiler
-        # flags during linking stage too. This file is processed after
-        # default_post.prf, so the QMAKE_CXXFLAGS already contains
-        # QMAKE_CXXFLAGS_DEBUG or _RELEASE.
-        use_c_linker {
-            # use_c_linker.prf is in effect, use the C flags
-            QMAKE_LFLAGS_LTCG += $$QMAKE_CFLAGS $$QMAKE_CFLAGS_LTCG
-            QMAKE_LFLAGS_APP += $$QMAKE_CFLAGS_APP
-            QMAKE_LFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
-        } else {
-            QMAKE_LFLAGS_LTCG = $$QMAKE_CXXFLAGS $$QMAKE_LFLAGS_LTCG
-            QMAKE_LFLAGS_APP += $$QMAKE_CXXFLAGS_APP
-            QMAKE_LFLAGS_SHLIB += $$QMAKE_CXXFLAGS_SHLIB
-        }
     }
 
+    load(link_ltcg)
     QMAKE_CFLAGS *= $$QMAKE_CFLAGS_LTCG
     QMAKE_CXXFLAGS *= $$QMAKE_CXXFLAGS_LTCG
     QMAKE_LFLAGS *= $$QMAKE_LFLAGS_LTCG
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 97be211595..d2e698894f 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -9,11 +9,15 @@ isEmpty(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path) {
     QMAKE_MAC_SDK_PATH = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version Path 2>/dev/null")
     isEmpty(QMAKE_MAC_SDK_PATH): error("Could not resolve SDK path for \'$$QMAKE_MAC_SDK\'")
     cache(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path, set stash, QMAKE_MAC_SDK_PATH)
+} else {
+    QMAKE_MAC_SDK_PATH = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)
+}
+
+isEmpty(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version) {
     QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version SDKVersion 2>/dev/null")
     isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$$QMAKE_MAC_SDK\'")
     cache(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version, set stash, QMAKE_MAC_SDK_VERSION)
 } else {
-    QMAKE_MAC_SDK_PATH = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)
     QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.version)
 }
 
diff --git a/mkspecs/features/no_debug_info.prf b/mkspecs/features/no_debug_info.prf
index e05410d491..1307679a39 100644
--- a/mkspecs/features/no_debug_info.prf
+++ b/mkspecs/features/no_debug_info.prf
@@ -7,8 +7,8 @@ win32-msvc2*|wince*msvc* {
     QMAKE_CXXFLAGS_DEBUG -= -Zi
     QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zi
 } else {
-    QMAKE_CFLAGS -= -g -ggdb3
-    QMAKE_CXXFLAGS -= -g -ggdb3
-    QMAKE_LFLAGS -= -g -ggdb3
-    QMAKE_LIBFLAGS -= -g -ggdb3
+    QMAKE_CFLAGS -= -g -ggdb3 -gstabs
+    QMAKE_CXXFLAGS -= -g -ggdb3 -gstabs
+    QMAKE_LFLAGS -= -g -ggdb3 -gstabs
+    QMAKE_LIBFLAGS -= -g -ggdb3 -gstabs
 }
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index a9a622dd1d..7961f6512a 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -68,6 +68,7 @@ defineTest(qtAddModule) {
         using_privates = true
         export(using_privates)
     }
+    contains(MODULE_CONFIG, ltcg): CONFIG += link_ltcg
 
     qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG)
     qtProcessModuleFlags(DEFINES, QT.$${1}.DEFINES)
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 9a876caf5e..03a8e5db71 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -66,6 +66,8 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
         module_build_type =
     internal_module: \
         module_build_type += internal_module
+    ltcg: \
+        module_build_type += ltcg
     !isEmpty(MODULE_CONFIG): \
         module_config = "QT.$${MODULE_ID}.CONFIG = $$MODULE_CONFIG"
     else: \
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 643a17e23e..aa849eb8b1 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -68,8 +68,7 @@ equals(TEMPLATE, app) {
                     debug-iphonesimulator-distclean debug-iphoneos-distclean \
                     release-iphonesimulator-distclean release-iphoneos-distclean
                 QMAKE_EXTRA_TARGETS += xcode_distclean
-                distclean.depends = xcode_distclean
-                QMAKE_EXTRA_TARGETS += distclean
+                DISTCLEAN_DEPS += xcode_distclean
 
                 mkpath($$OUT_PWD)|error("Aborting.")
                 args =
@@ -185,13 +184,17 @@ macx-xcode {
     launch_images.files = $$copy_image.output
     QMAKE_BUNDLE_DATA += launch_images
 
-    # Set up default LaunchScreen to support iPhone6/6+
-    launch_screen = LaunchScreen.xib
-    copy_launch_screen.input = $$QMAKESPEC/$$launch_screen
-    copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen
-    QMAKE_SUBSTITUTES += copy_launch_screen
-    launch_screens.files = $$copy_launch_screen.output
-    QMAKE_BUNDLE_DATA += launch_screens
+    lessThan(QMAKE_XCODE_VERSION, "6.0") {
+        warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+")
+    } else {
+        # Set up default LaunchScreen to support iPhone6/6+
+        launch_screen = LaunchScreen.xib
+        copy_launch_screen.input = $$QMAKESPEC/$$launch_screen
+        copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen
+        QMAKE_SUBSTITUTES += copy_launch_screen
+        launch_screens.files = $$copy_launch_screen.output
+        QMAKE_BUNDLE_DATA += launch_screens
+    }
 }
 
 macx-xcode {