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

Conflicts:
	.qmake.conf

Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839

7 files changed, 41 insertions, 10 deletions

diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index 95db8b93f9..bb10113fe7 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -12,7 +12,7 @@ MAKEFILE_GENERATOR      = MSVC.NET
 QMAKE_PLATFORM          = win32
 QMAKE_COMPILER          = msvc
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-DEFINES                += UNICODE WIN32
+DEFINES                += UNICODE _UNICODE WIN32
 QMAKE_COMPILER_DEFINES += _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
diff --git a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
index 9c25feb43f..18683e01e3 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -4,8 +4,9 @@
   xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\"
   xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"
   xmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\"
+  xmlns:uap3=\"http://schemas.microsoft.com/appx/manifest/uap/windows10/3\"
   xmlns:mobile=\"http://schemas.microsoft.com/appx/manifest/mobile/windows10\"
-  IgnorableNamespaces=\"uap mp mobile\">
+  IgnorableNamespaces=\"uap uap3 mp mobile\">
 
   <Identity
     Name=\"$${WINRT_MANIFEST.identity}\"
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index 1e138730b3..e66c24b027 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -65,6 +65,8 @@ clang {
     greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS_WARN_ON += -Wdate-time
     # GCC 6 introduced these
     greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond
+    # GCC 7 has a lot of false positives relating to this, so disable completely
+    greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow
 }
 
 warnings_are_errors:warning_clean {
diff --git a/mkspecs/features/qt_targets.prf b/mkspecs/features/qt_targets.prf
index cd76efdaf3..49f7e6bd43 100644
--- a/mkspecs/features/qt_targets.prf
+++ b/mkspecs/features/qt_targets.prf
@@ -1,4 +1,4 @@
-QMAKE_TARGET_COMPANY = The Qt Company Ltd
+QMAKE_TARGET_COMPANY = The Qt Company Ltd.
 isEmpty(QMAKE_TARGET_PRODUCT): QMAKE_TARGET_PRODUCT = Qt5
-isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = C++ application development framework.
+isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = C++ Application Development Framework
 QMAKE_TARGET_COPYRIGHT = Copyright (C) 2017 The Qt Company Ltd.
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
index a8d589f0fa..a516e5ba4b 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -10,6 +10,9 @@
 #
 
 CONFIG += no_launch_target
+isEmpty(VERSION): VERSION = $$MODULE_VERSION
+isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = \
+    "Tool for the Qt Application Development Framework"
 load(qt_app)
 
 CONFIG += console
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index a00c84948c..d850254dcf 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -116,9 +116,8 @@
 
         INDENT = "$$escape_expand(\\r\\n)  "
 
-        # All Windows 10 applications need to have internetClient. It is also not marked as additional
-        # capability anymore and is assumed to be standard.
-        *-msvc2015|*-msvc2017: WINRT_MANIFEST.capabilities += internetClient
+        # All Windows 10 applications need to have internetClient.
+        WINRT_MANIFEST.capabilities += internetClient
 
         contains(WINRT_MANIFEST.capabilities, defaults) {
             WINRT_MANIFEST.capabilities -= defaults
@@ -130,13 +129,39 @@
             WINRT_MANIFEST.capabilities_device += $$WINRT_MANIFEST.capabilities_device_default
         }
 
+        UAP_CAPABILITIES += \
+            appointments \
+            blockedChatMessages \
+            chat \
+            contacts \
+            enterpriseAuthentication \
+            # internetClient is special, as it needs to be written without namespace
+            #internetClient \
+            musicLibrary \
+            objects3D \
+            phoneCall \
+            picturesLibrary \
+            removableStorage \
+            sharedUserCertificates \
+            userAccountInformation \
+            videosLibrary \
+            voipCall
+
+        UAP3_CAPABILITIES += backgroundMediaPlayback remoteSystem userNotificationListener
+
         # Capabilities are given as a string list and may change with the configuration (network, sensors, etc.)
         WINRT_MANIFEST.capabilities = $$unique(WINRT_MANIFEST.capabilities)
         WINRT_MANIFEST.capabilities_device = $$unique(WINRT_MANIFEST.capabilities_device)
         !isEmpty(WINRT_MANIFEST.capabilities)|!isEmpty(WINRT_MANIFEST.capabilities_device) {
             MANIFEST_CAPABILITIES += "<Capabilities>"
-            for(CAPABILITY, WINRT_MANIFEST.capabilities): \
-                MANIFEST_CAPABILITIES += "  <Capability Name=\"$$CAPABILITY\" />"
+            for (CAPABILITY, WINRT_MANIFEST.capabilities) {
+                contains(UAP_CAPABILITIES, $$CAPABILITY): \
+                    MANIFEST_CAPABILITIES += "  <uap:Capability Name=\"$$CAPABILITY\" />"
+                else:contains(UAP3_CAPABILITIES, $$CAPABILITY): \
+                    MANIFEST_CAPABILITIES += "  <uap3:Capability Name=\"$$CAPABILITY\" />"
+                else: \
+                    MANIFEST_CAPABILITIES += "  <Capability Name=\"$$CAPABILITY\" />"
+            }
             for(CAPABILITY, WINRT_MANIFEST.capabilities_device): \
                 MANIFEST_CAPABILITIES += "  <DeviceCapability Name=\"$$CAPABILITY\" />"
             MANIFEST_CAPABILITIES += "</Capabilities>"
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 394dd7d8bd..105391f6f4 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -13,7 +13,7 @@ include(../common/g++-base.conf)
 MAKEFILE_GENERATOR      = MINGW
 QMAKE_PLATFORM          = win32 mingw
 CONFIG                 += debug_and_release debug_and_release_target precompile_header
-DEFINES                += UNICODE
+DEFINES                += UNICODE _UNICODE
 QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
 
 QMAKE_EXT_OBJ           = .o