diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
| commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
| tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /mkspecs/common | |
| parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
| parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'mkspecs/common')
3 files changed, 3 insertions, 8 deletions
diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in index 42bac8b8b1..6583bf0643 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in @@ -32,8 +32,6 @@ <SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" /> </VisualElements> </Application> - </Applications> - <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities> - <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies> + </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies} </Package> <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in index 968f42fa06..5efb9c7b06 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in @@ -11,8 +11,7 @@ Description=\"$${WINRT_MANIFEST.description}\" Publisher=\"$${WINRT_MANIFEST.publisher}\" PublisherID=\"$${WINRT_MANIFEST.publisherid}\"> - <IconPath IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.logo_medium}</IconPath> - <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities> + <IconPath IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.logo_medium}</IconPath>$${WINRT_MANIFEST.capabilities} <Tasks> <DefaultTask Name=\"_default\" diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in index fcc4d75b0f..5587ace390 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in @@ -37,8 +37,6 @@ <v2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" /> </v2:VisualElements> </Application> - </Applications> - <Capabilities>$${WINRT_MANIFEST.capabilities}</Capabilities> - <Dependencies>$${WINRT_MANIFEST.dependencies}</Dependencies> + </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies} </Package> <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> |