diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-13 07:39:30 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-13 09:45:58 +0000 |
| commit | eb3e3853c4de146410478fca652ea24f3943f774 (patch) | |
| tree | df215a0379d5ce40c5c7725d1f00af982b280c03 /mkspecs/features/winrt/package_manifest.prf | |
| parent | 33044b83c261c485faa0a6f367773138f9892f76 (diff) | |
| parent | b94773c9c838a0b3db1bced0bc8daf5b04aefc29 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'mkspecs/features/winrt/package_manifest.prf')
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 3520fcdf93..291ebec6e9 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -112,10 +112,19 @@ # capability anymore and is assumed to be standard. *-msvc2015: WINRT_MANIFEST.capabilities += internetClient + contains(WINRT_MANIFEST.capabilities, defaults) { + WINRT_MANIFEST.capabilities -= defaults + WINRT_MANIFEST.capabilities += $$WINRT_MANIFEST.capabilities_default + } + + contains(WINRT_MANIFEST.capabilities_device, defaults) { + WINRT_MANIFEST.capabilities_device -= defaults + WINRT_MANIFEST.capabilities_device += $$WINRT_MANIFEST.capabilities_device_default + } + # 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): \ |