diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-11-18 09:40:48 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-11-19 19:59:17 +0000 |
| commit | 536b38c1d3c2e8da78232d86416d17ce0563f1b3 (patch) | |
| tree | c3e1609a31908a2bc896b6d54448f18fee630296 /mkspecs | |
| parent | 83d7e83b78df037836d81a9aedaba99655a587b9 (diff) | |
Remove hardcoded capabilities in Windows 10 manifest template
While all apps need to have internetClient as a capability, the option
to provide further capabilities via qmake has been removed in the
template.
Instead we add the required items inside the prf and keep the manifest
template as generic as possible.
Task-number: QTBUG-49504
Change-Id: If26b9da277a5269a57b34e74c146b40b1b64d091
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in | 5 | ||||
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 4 |
2 files changed, 5 insertions, 4 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 9e188084ad..d091ea3b82 100644 --- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in @@ -43,8 +43,5 @@ </uap:VisualElements> </Application> </Applications> - - <Capabilities> - <Capability Name=\"internetClient\" /> - </Capabilities> + $${WINRT_MANIFEST.capabilities} </Package> diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 9b4a6672e5..3520fcdf93 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -108,6 +108,10 @@ 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: WINRT_MANIFEST.capabilities += internetClient + # 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) |