diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-06-13 10:00:16 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-07-03 05:32:53 +0000 |
| commit | f74098d683c0fe5e01c8c4c63583823cf9e5053f (patch) | |
| tree | 57bc9c11e0b6c6543f145cffa432be394d3095ca /mkspecs | |
| parent | 9656e972d194ab41bbb8aea82d77af62bcd647e8 (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in | 3 | ||||
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 30 |
2 files changed, 30 insertions, 3 deletions
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/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index a00c84948c..094d8e40a1 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -130,13 +130,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>" |