diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /mkspecs/common/winrt_winphone/manifests | |
parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'mkspecs/common/winrt_winphone/manifests')
-rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in | 3 | ||||
-rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in | 3 |
2 files changed, 2 insertions, 4 deletions
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 91353c608b..b02b691f48 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in @@ -42,7 +42,6 @@ </m2:VisualElements> </Application> </Applications>$${WINRT_MANIFEST.capabilities} - <Dependencies>$${WINRT_MANIFEST.dependencies} - </Dependencies> + $${WINRT_MANIFEST.dependencies} </Package> <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in index 19deb94675..235fe96794 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in @@ -43,7 +43,6 @@ </m3:VisualElements> </Application> </Applications>$${WINRT_MANIFEST.capabilities} - <Dependencies>$${WINRT_MANIFEST.dependencies} - </Dependencies> + $${WINRT_MANIFEST.dependencies} </Package> <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. --> |