winrt: fix manifests

jjsz · Feb 28, 2016 · 7aa3461 · 7aa3461
1 parent 1193b96
commit 7aa3461
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/examples/QMLPlayer/QMLPlayer_sdk.pro b/examples/QMLPlayer/QMLPlayer_sdk.pro
@@ -125,13 +125,17 @@ winrt|wince {
     $$[QT_INSTALL_BINS]/avfilter-*.dll \
     $$[QT_INSTALL_BINS]/swresample-*.dll \
     $$[QT_INSTALL_BINS]/swscale-*.dll
+  exists($$[QT_INSTALL_BINS]/avresample-*.dll): depend_dll.files += $$[QT_INSTALL_BINS]/avresample-*.dll
   exists($$[QT_INSTALL_BINS]/ass.dll): depend_dll.files += $$[QT_INSTALL_BINS]/ass.dll
   #depend_dll.path = $$OUT_PWD
-  DEPLOYMENT = depend_dll fonts #vs2015update1 error about multiple qt5core.dll(in both build dir and qtbin dir), we can remove them in `Deployment Files`
+  DEPLOYMENT = depend_dll #fonts #vs2015update1 error about multiple qt5core.dll(in both build dir and qtbin dir), we can remove them in `Deployment Files`
 # WINRT_MANIFEST file: "=>\"
+  VCLibsSuffix =
   winphone {
+    VCLibsSuffix = .Phone
     WINRT_MANIFEST = winrt/WinPhone8.Package.appxmanifest
   } else:*-msvc2015 {
+    #isEqual(VCPROJ_ARCH, ARM): VCLibsSuffix = .Phone
     WINRT_MANIFEST = winrt/WinRT10.Package.appxmanifest
   } else {
     WINRT_MANIFEST = winrt/WinRT8.Package.appxmanifest

diff --git a/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest b/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest
@@ -2,9 +2,9 @@
 <Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m3=\"http://schemas.microsoft.com/appx/2014/manifest\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\">
   <Identity
     Name=\"org.qtav.qmlplayer\"
-    ProcessorArchitecture=\"$$VCPROJ_ARCH\"
+    ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.9.1.0\" />
+    Version=\"1.10.0.0\" />
   <mp:PhoneIdentity
     PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"
     PhonePublisherId=\"00000000-0000-0000-0000-000000000000\" />

diff --git a/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest b/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest
@@ -4,13 +4,14 @@
   xmlns=\"http://schemas.microsoft.com/appx/manifest/foundation/windows10\"
   xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"
   xmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\"
-  IgnorableNamespaces=\"uap mp\">
+  xmlns:mobile=\"http://schemas.microsoft.com/appx/manifest/mobile/windows10\"
+  IgnorableNamespaces=\"uap mp mobile\">
 
   <Identity
     Name=\"org.qtav.qmlplayer\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.9.1.0\"
-    ProcessorArchitecture=\"$$VCPROJ_ARCH\" /> <!--replaced by qmake-->
+    Version=\"1.10.0.0\"
+    ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\" /> <!--replaced by qmake-->
   <mp:PhoneIdentity
     PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"
     PhonePublisherId=\"00000000-0000-0000-0000-000000000000\" />
@@ -21,8 +22,8 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.10069.0\" />
-    <PackageDependency Name=\"Microsoft.VCLibs.140.00\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US\" />
+    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.0.0\" MaxVersionTested=\"10.0.0.0\" />
+    <PackageDependency Name=\"Microsoft.VCLibs.140.00$$VCLibsSuffix\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US\" />
   </Dependencies>
 
   <Resources>
@@ -37,7 +38,6 @@
         DisplayName=\"QtAV QMLPlayer\"
         Description=\"A powerful multimedia player for all platforms\"
         BackgroundColor=\"green\"
-        ForegroundText=\"light\"
         Square150x150Logo=\"assets/logo_150x150.png\"
         Square44x44Logo=\"assets/logo_44x44.png\">
 

diff --git a/examples/QMLPlayer/winrt/WinRT8.Package.appxmanifest b/examples/QMLPlayer/winrt/WinRT8.Package.appxmanifest
@@ -2,9 +2,9 @@
 <Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\">
   <Identity
     Name=\"org.qtav.qmlplayer\"
-    ProcessorArchitecture=\"$$VCPROJ_ARCH\"
+    ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.9.1.0\" />
+    Version=\"1.10.0.0\" />
   <Properties>
     <DisplayName>QtAV QMLPlayer</DisplayName>
     <PublisherDisplayName>Lucas Wang</PublisherDisplayName>
@@ -15,7 +15,7 @@
     <OSMaxVersionTested>6.3.0</OSMaxVersionTested>
   </Prerequisites>
   <Resources>
-    <Resource Language=\"en\" />
+    <Resource Language=\"x-generate\" />
   </Resources>
   <Applications>
     <Application