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

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

17 files changed, 76 insertions, 34 deletions

diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index e3fa924e23..732d415f9a 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -107,11 +107,15 @@ equals(ANDROID_TARGET_ARCH, x86) {
     QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -gdwarf-2 -O2
     QMAKE_CFLAGS_DEBUG                     = -g -gdwarf-2 -fno-omit-frame-pointer
 } else { # arm
-    QMAKE_CFLAGS_RELEASE                   = -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64
-    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -gdwarf-2 -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64
+    QMAKE_CFLAGS_RELEASE                   = -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64
+    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO    = -g -gdwarf-2 -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64
     QMAKE_CFLAGS_DEBUG                     = -g -gdwarf-2 -marm -O0 -fno-omit-frame-pointer
-    equals(ANDROID_TARGET_ARCH, armeabi): equals(NDK_TOOLCHAIN_VERSION, 4.8): \
+    equals(ANDROID_TARGET_ARCH, armeabi): equals(NDK_TOOLCHAIN_VERSION, 4.8) {
         DEFINES += QT_OS_ANDROID_GCC_48_WORKAROUND
+    } else {
+        QMAKE_CFLAGS_RELEASE += -mthumb
+        QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -mthumb
+    }
 }
 
 QMAKE_CFLAGS_SHLIB      = -fPIC
diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
index 42bac8b8b1..6583bf0643 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
@@ -32,8 +32,6 @@
         <SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
       </VisualElements>
     </Application>
-  </Applications>
-  <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities>
-  <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies>
+  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
index 968f42fa06..5efb9c7b06 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
@@ -11,8 +11,7 @@
     Description=\"$${WINRT_MANIFEST.description}\"
     Publisher=\"$${WINRT_MANIFEST.publisher}\"
     PublisherID=\"$${WINRT_MANIFEST.publisherid}\">
-    <IconPath IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.logo_medium}</IconPath>
-    <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities>
+    <IconPath IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.logo_medium}</IconPath>$${WINRT_MANIFEST.capabilities}
     <Tasks>
       <DefaultTask
         Name=\"_default\"
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
index fcc4d75b0f..5587ace390 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
@@ -37,8 +37,6 @@
         <v2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
       </v2:VisualElements>
     </Application>
-  </Applications>
-  <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities>
-  <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies>
+  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 051420e4f1..6cd848b405 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -19,7 +19,6 @@ contains(TEMPLATE, .*lib) {
     unix:contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
     contains(QT_CONFIG, largefile): CONFIG += largefile
     contains(QT_CONFIG, separate_debug_info): CONFIG += separate_debug_info
-    contains(QT_CONFIG, separate_debug_info_nocopy): CONFIG += separate_debug_info_nocopy
 }
 
 warnings_are_errors:warning_clean {
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index f710bbff43..ba12b9c1cd 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -55,12 +55,11 @@ load(qt_common)
 wince*:LIBS += $$QMAKE_LIBS_GUI
 QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
-unix|mingw {
-    !isEmpty(_QMAKE_SUPER_CACHE_): \
-        rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
-    else: \
-        rplbase = $$MODULE_BASE_OUTDIR
-    lib_replace.match = $$rplbase/lib
-    lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
-    QMAKE_PRL_INSTALL_REPLACE += lib_replace
-}
+!isEmpty(_QMAKE_SUPER_CACHE_): \
+    rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
+else: \
+    rplbase = $$MODULE_BASE_OUTDIR
+lib_replace.match = $$rplbase/lib
+lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
+lib_replace.CONFIG = path
+QMAKE_PRL_INSTALL_REPLACE += lib_replace
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index 10f421a8e2..40ec7cff30 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -134,6 +134,28 @@ contains(INSTALLS, target) {
         INSTALLS += $$tdi
     }
 
+    # Install GENERATED_TESTDATA.
+    # Logic is copied from the TESTDATA installation, only difference being that
+    # INSTALL target is added with CONFIG = no_check_exist
+    for(file, GENERATED_TESTDATA) {
+        tnam = $$file
+        tnam ~= s,\\.\\.,dotdot,
+        tnam ~= s,[?*],wildcard,
+        tnam ~= s,[^A-Za-z0-9],_,
+        tdi = testdata_$$tnam
+        tdif = $${tdi}.files
+        tdip = $${tdi}.path
+        tdic = $${tdi}.CONFIG
+
+        $$tdif = $$file
+        $$tdic = no_check_exist
+
+        file = $$replace(file, ^(\\.\\./)+, )
+        $$tdip = $${target.path}/$$dirname(file)
+
+        INSTALLS += $$tdi
+    }
+
     # TEST_HELPER_INSTALLS specifies additional test helper executables for installation.
     #
     # Typical usage is:
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index c5ff6dcba3..394d5f42bc 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -1,5 +1,5 @@
 
-!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
+have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
     qnx {
         debug_info_suffix = sym
         debug_info_keep = --keep-file-symbols
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 969a6780ce..a959bc5480 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -39,8 +39,13 @@
 
     manifest_file.input = $$WINRT_MANIFEST
 
-    load(resolve_target)
-    BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET)
+    contains(TEMPLATE, "vc.*") {
+        BUILD_DIR = $$OUT_PWD
+    } else {
+        load(resolve_target)
+        BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET)
+    }
+
     winphone: \
         manifest_file.output = $$BUILD_DIR/WMAppManifest.xml
     else: contains(TEMPLATE, "vc.*"): \
@@ -87,16 +92,28 @@
 
     winphone: INDENT = "$$escape_expand(\\r\\n)    "
     else: INDENT = "$$escape_expand(\\r\\n)  "
+
     # Capabilities are given as a string list and may change with the configuration (network, sensors, etc.)
     WINRT_MANIFEST.capabilities = $$unique(WINRT_MANIFEST.capabilities)
-    for(CAPABILITY, WINRT_MANIFEST.capabilities): \
-        MANIFEST_CAPABILITIES += "  <Capability Name=\"$$CAPABILITY\" />"
-    WINRT_MANIFEST.capabilities = $$join(MANIFEST_CAPABILITIES, $$INDENT, $$INDENT, $$INDENT)
+    !isEmpty(WINRT_MANIFEST.capabilities)|winphone {
+        MANIFEST_CAPABILITIES += "<Capabilities>"
+        for(CAPABILITY, WINRT_MANIFEST.capabilities): \
+            MANIFEST_CAPABILITIES += "  <Capability Name=\"$$CAPABILITY\" />"
+        MANIFEST_CAPABILITIES += "</Capabilities>"
+
+        WINRT_MANIFEST.capabilities = $$join(MANIFEST_CAPABILITIES, $$INDENT, $$INDENT)
+    }
+
     # Dependencies are given as a string list. The CRT dependency is added automatically above.
     WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies)
-    for(DEPENDENCY, WINRT_MANIFEST.dependencies): \
-        MANIFEST_DEPENDENCIES += "  <PackageDependency Name=\"$$DEPENDENCY\" />"
-    WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT, $$INDENT)
+    !isEmpty(WINRT_MANIFEST.dependencies) {
+        MANIFEST_DEPENDENCIES += "<Dependencies>"
+        for(DEPENDENCY, WINRT_MANIFEST.dependencies): \
+            MANIFEST_DEPENDENCIES += "  <PackageDependency Name=\"$$DEPENDENCY\" />"
+        MANIFEST_DEPENDENCIES += "</Dependencies>"
+
+        WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT)
+    }
 
     # Provide default icons where needed
     isEmpty(WINRT_ASSETS_PATH): WINRT_ASSETS_PATH = $$[QT_HOST_DATA/get]/mkspecs/common/winrt_winphone/assets
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf
index 28ad095da7..8b339dacdc 100644
--- a/mkspecs/macx-ios-clang/features/default_post.prf
+++ b/mkspecs/macx-ios-clang/features/default_post.prf
@@ -71,6 +71,7 @@ equals(TEMPLATE, app) {
                 distclean.depends = xcode_distclean
                 QMAKE_EXTRA_TARGETS += distclean
 
+                mkpath($$OUT_PWD)|error("Aborting.")
                 args =
                 for(arg, QMAKE_ARGS): \
                     args += $$system_quote($$arg)
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 4a0fab761e..d89bfba958 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR      = MSVC.NET
 QMAKE_PLATFORM          = win32
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 DEFINES                += UNICODE WIN32
+MSVC_VER                = 8.0
 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 8fd6eb0c7d..35693d0356 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR      = MSVC.NET
 QMAKE_PLATFORM          = win32
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 DEFINES                += UNICODE WIN32
+MSVC_VER                = 9.0
 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 07422abb0a..f24da2d5c6 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR      = MSBUILD
 QMAKE_PLATFORM          = win32
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 DEFINES                += UNICODE WIN32
+MSVC_VER                = 10.0
 QMAKE_COMPILER_DEFINES += _MSC_VER=1600 _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf
index 45054862ba..18ffc27711 100644
--- a/mkspecs/win32-msvc2012/qmake.conf
+++ b/mkspecs/win32-msvc2012/qmake.conf
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR      = MSBUILD
 QMAKE_PLATFORM          = win32
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 DEFINES                += UNICODE WIN32
+MSVC_VER                = 11.0
 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/win32-msvc2013/qmake.conf b/mkspecs/win32-msvc2013/qmake.conf
index 9fc69e4d1a..ad46a2fb72 100644
--- a/mkspecs/win32-msvc2013/qmake.conf
+++ b/mkspecs/win32-msvc2013/qmake.conf
@@ -8,6 +8,7 @@ MAKEFILE_GENERATOR      = MSBUILD
 QMAKE_PLATFORM          = win32
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 DEFINES                += UNICODE WIN32
+MSVC_VER                = 12.0
 QMAKE_COMPILER_DEFINES += _MSC_VER=1800 _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/winphone-arm-msvc2012/qmake.conf b/mkspecs/winphone-arm-msvc2012/qmake.conf
index c4e3d2bab7..72961c320d 100644
--- a/mkspecs/winphone-arm-msvc2012/qmake.conf
+++ b/mkspecs/winphone-arm-msvc2012/qmake.conf
@@ -7,11 +7,11 @@
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1700
 QMAKE_PLATFORM          = winphone $$QMAKE_PLATFORM
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__ QT_NO_CURSOR
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__
 
 QMAKE_LFLAGS           += /MACHINE:ARM
 
-QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib ws2_32.lib
+QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib
 
 VCPROJ_ARCH             = ARM
 MSVC_VER                = 11.0
diff --git a/mkspecs/winphone-x86-msvc2012/qmake.conf b/mkspecs/winphone-x86-msvc2012/qmake.conf
index 4b8a92ea3b..f7838d187a 100644
--- a/mkspecs/winphone-x86-msvc2012/qmake.conf
+++ b/mkspecs/winphone-x86-msvc2012/qmake.conf
@@ -7,11 +7,11 @@
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1700
 QMAKE_PLATFORM          = winphone $$QMAKE_PLATFORM
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__ QT_NO_CURSOR
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__
 
 QMAKE_LFLAGS           += /MACHINE:X86
 
-QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib ws2_32.lib
+QMAKE_LIBS             += WindowsPhoneCore.lib PhoneAppModelHost.lib
 
 VCPROJ_ARCH             = Win32
 MSVC_VER                = 11.0