From f74098d683c0fe5e01c8c4c63583823cf9e5053f Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 13 Jun 2017 10:00:16 +0200 Subject: winrt: Update capability management Introduce uap3 namespace which is used for newly introduced capabilities. In addition, the autodetection of namespaces for capabilities within the uap namespace is disabled in Visual Studio lately. Hence, the output needs to be more verbose including the namespace for a capability. Task-number: QTBUG-60899 Change-Id: Ia1ccf825d4c257d2661e34c195c45fd37e0b6413 Reviewed-by: Oliver Wolff --- .../manifests/10.0/AppxManifest.xml.in | 3 ++- mkspecs/features/winrt/package_manifest.prf | 30 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) (limited to 'mkspecs') 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\"> " + for (CAPABILITY, WINRT_MANIFEST.capabilities) { + contains(UAP_CAPABILITIES, $$CAPABILITY): \ + MANIFEST_CAPABILITIES += " " + else:contains(UAP3_CAPABILITIES, $$CAPABILITY): \ + MANIFEST_CAPABILITIES += " " + else: \ + MANIFEST_CAPABILITIES += " " + } for(CAPABILITY, WINRT_MANIFEST.capabilities_device): \ MANIFEST_CAPABILITIES += " " MANIFEST_CAPABILITIES += "" -- cgit v1.2.3 From 798c5269192a5534c45102424720f4c77b1b3eff Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 13 Jun 2017 10:41:06 +0200 Subject: winrt: remove legacy checks Any version prior to 2015 is not supported anymore. Change-Id: I9ccc87fc506521b560fda1b4c88f9c3aebd7a485 Reviewed-by: Oswald Buddenhagen Reviewed-by: Oliver Wolff --- mkspecs/features/winrt/package_manifest.prf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 094d8e40a1..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 -- cgit v1.2.3 From f046ed395a5d2c3838631e48d5b072f33a97f001 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 14 Jun 2017 15:58:44 +0200 Subject: Set VERSION for Qt tools This creates a VersionInfo resource on Windows for Qt's tool executables similar to what Qt's DLLs contain. Task-number: QTBUG-55755 Change-Id: I9e5d7bedaec9d14f29a9eeeb6697b07241f860d8 Reviewed-by: Friedemann Kleint --- mkspecs/features/qt_tool.prf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mkspecs') 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 -- cgit v1.2.3 From b446275ac70e99b28efa9b6fcc84ec989cac8c4b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 14 Jun 2017 16:06:28 +0200 Subject: Make Qt's VersionInformation resource strings consistent The strings in Windows VersionInformation resources should be capitalized by convention, and the entries are usually not terminated by a dot. However, "Ltd." is an abbreviation and should be dot-terminated. Change-Id: Ibea3443ac38846e29a3e77ab3e8d5d77b9370272 Reviewed-by: Friedemann Kleint --- mkspecs/features/qt_targets.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs') 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. -- cgit v1.2.3 From 0512c3e257a7e677484ee7c9a495e68fb22af985 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 14 Jun 2017 15:12:39 +0200 Subject: Add _UNICODE define to MSVC and MinGW mkspecs System headers like tchar.h need the _UNICODE define, not UNICODE. While qplatformdefs.h already provides _UNICODE when UNICODE is defined, users might want to include tchar.h without Qt includes. This is consistent with Visual Studio's default defines. Task-number: QTBUG-61411 Change-Id: I2f604368080270d840f0dbb2cf273805d2ba5239 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- mkspecs/common/msvc-desktop.conf | 2 +- mkspecs/win32-g++/qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 5296050ad8..f538acfcd9 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/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 625758c751..29151ef8b9 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 -- cgit v1.2.3 From d3590d32a53c90fec6596bd8f443c8a6f55d2bef Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 2 Jun 2017 23:29:11 -0700 Subject: Disable the -Wstringop-overflow warning from GCC 7 It prints the warning even if we surround the affected code with QT_WARNING_DISABLE_GCC("-Wstringop-overflow") (see e4eaa629439fe1ba1e), so we have no alternative other than to disable the warning completely. Change-Id: Ia3e896da908f42939148fffd14c488c4006040e6 Reviewed-by: Ville Voutilainen Reviewed-by: Giuseppe D'Angelo Reviewed-by: Thiago Macieira --- mkspecs/features/qt_common.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs') 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 { -- cgit v1.2.3