diff options
author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /mkspecs/features/winrt/package_manifest.prf | |
parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'mkspecs/features/winrt/package_manifest.prf')
-rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 35 |
1 files changed, 30 insertions, 5 deletions
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>" |