Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/features/qt.prf
	src/plugins/platforms/xcb/qxcbwindow.h
	src/tools/qdoc/qdocindexfiles.cpp
	src/widgets/kernel/qwidget_qpa.cpp

Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67

5 files changed, 54 insertions, 9 deletions

diff --git a/mkspecs/common/winrt_winphone/assets/logo_44x44.png b/mkspecs/common/winrt_winphone/assets/logo_44x44.png
new file mode 100644
index 0000000000..3cc5bec19f
--- /dev/null
+++ b/mkspecs/common/winrt_winphone/assets/logo_44x44.png
diff --git a/mkspecs/common/winrt_winphone/assets/logo_480x800.png b/mkspecs/common/winrt_winphone/assets/logo_480x800.png
new file mode 100644
index 0000000000..39a37dac5b
--- /dev/null
+++ b/mkspecs/common/winrt_winphone/assets/logo_480x800.png
diff --git a/mkspecs/common/winrt_winphone/assets/logo_71x71.png b/mkspecs/common/winrt_winphone/assets/logo_71x71.png
new file mode 100644
index 0000000000..16d0808759
--- /dev/null
+++ b/mkspecs/common/winrt_winphone/assets/logo_71x71.png
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 5587ace390..97d3407403 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
@@ -1,5 +1,5 @@
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
-<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:v2=\"http://schemas.microsoft.com/appx/2013/manifest\">
+<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\">
   <Identity
     Name=\"$${WINRT_MANIFEST.identity}\"
     ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\"
@@ -22,20 +22,20 @@
       Id=\"App\"
       Executable=\"$${WINRT_MANIFEST.target}.exe\"
       EntryPoint=\"$${WINRT_MANIFEST.target}.App\">
-      <v2:VisualElements
+      <m2:VisualElements
         DisplayName=\"$${WINRT_MANIFEST.name}\"
         Description=\"$${WINRT_MANIFEST.description}\"
         BackgroundColor=\"$${WINRT_MANIFEST.background}\"
         ForegroundText=\"$${WINRT_MANIFEST.foreground}\"
         Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\"
         Square30x30Logo=\"$${WINRT_MANIFEST.logo_small}\">
-        <v2:DefaultTile>
-          <v2:ShowNameOnTiles>
-            <v2:ShowOn Tile=\"square150x150Logo\" />
-          </v2:ShowNameOnTiles>
-        </v2:DefaultTile>
-        <v2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
-      </v2:VisualElements>
+        <m2:DefaultTile>
+          <m2:ShowNameOnTiles>
+            <m2:ShowOn Tile=\"square150x150Logo\" />
+          </m2:ShowNameOnTiles>
+        </m2:DefaultTile>
+        <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
+      </m2:VisualElements>
     </Application>
   </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
 </Package>
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
new file mode 100644
index 0000000000..cf18a4dc79
--- /dev/null
+++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
@@ -0,0 +1,45 @@
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<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=\"$${WINRT_MANIFEST.identity}\"
+    ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\"
+    Publisher=\"$${WINRT_MANIFEST.publisherid}\"
+    Version=\"$${WINRT_MANIFEST.version}\" />
+  <mp:PhoneIdentity
+    PhoneProductId=\"$${WINRT_MANIFEST.phone_product_id}\"
+    PhonePublisherId=\"$${WINRT_MANIFEST.phone_publisher_id}\" />
+  <Properties>
+    <DisplayName>$${WINRT_MANIFEST.name}</DisplayName>
+    <PublisherDisplayName>$${WINRT_MANIFEST.publisher}</PublisherDisplayName>
+    <Logo>$${WINRT_MANIFEST.logo_store}</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.3.1</OSMinVersion>
+    <OSMaxVersionTested>6.3.1</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language=\"en\" />
+  </Resources>
+  <Applications>
+    <Application
+      Id=\"App\"
+      Executable=\"$${WINRT_MANIFEST.target}.exe\"
+      EntryPoint=\"$${WINRT_MANIFEST.target}.App\">
+      <m3:VisualElements
+        DisplayName=\"$${WINRT_MANIFEST.name}\"
+        Description=\"$${WINRT_MANIFEST.description}\"
+        BackgroundColor=\"$${WINRT_MANIFEST.background}\"
+        ForegroundText=\"$${WINRT_MANIFEST.foreground}\"
+        Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\"
+        Square44x44Logo=\"$${WINRT_MANIFEST.logo_44x44}\">
+        <m3:DefaultTile Square71x71Logo=\"$${WINRT_MANIFEST.logo_71x71}\">
+          <m3:ShowNameOnTiles>
+            <m3:ShowOn Tile=\"square150x150Logo\" />
+          </m3:ShowNameOnTiles>
+        </m3:DefaultTile>
+        <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />
+      </m3:VisualElements>
+    </Application>
+  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
+</Package>
+<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->