From 1309205b8b5a39e9a5c6ca86f104d83095c3890d Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Wed, 19 Feb 2020 18:21:35 +0100
Subject: winrt: Update capability management to include IOT namespace

Change-Id: Ib24ecb70454af5ab2e82ebbdc1fed9ef2a52bbb1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in | 3 ++-
 mkspecs/features/winrt/package_manifest.prf                      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

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 18683e01e3..fe9ddaf8f1 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -6,7 +6,8 @@
   xmlns:uap=\"http://schemas.microsoft.com/appx/manifest/uap/windows10\"
   xmlns:uap3=\"http://schemas.microsoft.com/appx/manifest/uap/windows10/3\"
   xmlns:mobile=\"http://schemas.microsoft.com/appx/manifest/mobile/windows10\"
-  IgnorableNamespaces=\"uap uap3 mp mobile\">
+  xmlns:iot=\"http://schemas.microsoft.com/appx/manifest/iot/windows10\"
+  IgnorableNamespaces=\"uap uap3 mp mobile iot\">
 
   <Identity
     Name=\"$${WINRT_MANIFEST.identity}\"
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 969343cfd7..22bda003fb 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -123,6 +123,8 @@
 
         UAP3_CAPABILITIES += backgroundMediaPlayback remoteSystem userNotificationListener
 
+        IOT_CAPABILITIES += systemManagement
+
         # 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)
@@ -133,6 +135,8 @@
                     MANIFEST_CAPABILITIES += "  <uap:Capability Name=\"$$CAPABILITY\" />"
                 else:contains(UAP3_CAPABILITIES, $$CAPABILITY): \
                     MANIFEST_CAPABILITIES += "  <uap3:Capability Name=\"$$CAPABILITY\" />"
+                else:contains(IOT_CAPABILITIES, $$CAPABILITY): \
+                    MANIFEST_CAPABILITIES += "  <iot:Capability Name=\"$$CAPABILITY\" />"
                 else: \
                     MANIFEST_CAPABILITIES += "  <Capability Name=\"$$CAPABILITY\" />"
             }
-- 
cgit v1.2.3


From bcdf49bcc6c357c9c30708e2e95ce4b8dbeb9f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Thu, 30 Jan 2020 13:43:03 +0100
Subject: wasm: support emsdk >= 1.39.4

Keep using the old/deprecated behavior for the Qt 5.14
series.

Task-number: QTBUG-74601
Change-Id: Icee99803f300dfa0116a4de75f9fb26d1010625d
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
---
 mkspecs/wasm-emscripten/qmake.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mkspecs')

diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf
index f4e9501415..beb08d643c 100644
--- a/mkspecs/wasm-emscripten/qmake.conf
+++ b/mkspecs/wasm-emscripten/qmake.conf
@@ -36,6 +36,7 @@ EMCC_COMMON_LFLAGS += \
     -s NO_EXIT_RUNTIME=0 \
     -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
     -s EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF16ToString\",\"stringToUTF16\"] \
+    -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 \
     --bind
 
 # The -s arguments can also be used with release builds,
-- 
cgit v1.2.3