wasm: add iOS to platform detection

Add iPad and move iPhone platform to iOS

Pick-to: 6.6 6.5
Fixes: QTBUG-114446
Change-Id: I3f601fbe5f3899c0658ee65acf72bbf37d51bf73
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>

3 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/platforms/wasm/qwasminputcontext.cpp b/src/plugins/platforms/wasm/qwasminputcontext.cpp
index 157f96fe49..fb2d81d33d 100644
--- a/src/plugins/platforms/wasm/qwasminputcontext.cpp
+++ b/src/plugins/platforms/wasm/qwasminputcontext.cpp
@@ -66,7 +66,7 @@ QWasmInputContext::QWasmInputContext()
 
     }
 
-    if (platform() == Platform::MacOS || platform() == Platform::iPhone) {
+    if (platform() == Platform::MacOS || platform() == Platform::iOS) {
         auto callback = [=](emscripten::val) {
             m_inputElement["parentElement"].call<void>("removeChild", m_inputElement);
             inputPanelIsOpen = false;
@@ -118,7 +118,7 @@ void QWasmInputContext::showInputPanel()
     // screen element.
 
     if (platform() == Platform::MacOS // keep for compatibility
-     || platform() == Platform::iPhone
+     || platform() == Platform::iOS
      || platform() == Platform::Windows) {
         emscripten::val inputWrapper = inputHandlerElementForFocusedWindow();
         if (inputWrapper.isUndefined())
diff --git a/src/plugins/platforms/wasm/qwasmplatform.cpp b/src/plugins/platforms/wasm/qwasmplatform.cpp
index c641e345e4..e54992be1d 100644
--- a/src/plugins/platforms/wasm/qwasmplatform.cpp
+++ b/src/plugins/platforms/wasm/qwasmplatform.cpp
@@ -13,8 +13,9 @@ Platform platform()
 
         if (rawPlatform.call<bool>("includes", emscripten::val("Mac")))
             return Platform::MacOS;
-        if (rawPlatform.call<bool>("includes", emscripten::val("iPhone")))
-            return Platform::iPhone;
+        if (rawPlatform.call<bool>("includes", emscripten::val("iPhone"))
+        || rawPlatform.call<bool>("includes", emscripten::val("iPad")))
+            return Platform::iOS;
         if (rawPlatform.call<bool>("includes", emscripten::val("Win32")))
             return Platform::Windows;
         if (rawPlatform.call<bool>("includes", emscripten::val("Linux"))) {
diff --git a/src/plugins/platforms/wasm/qwasmplatform.h b/src/plugins/platforms/wasm/qwasmplatform.h
index 239efdeae9..5b32e43633 100644
--- a/src/plugins/platforms/wasm/qwasmplatform.h
+++ b/src/plugins/platforms/wasm/qwasmplatform.h
@@ -19,7 +19,7 @@ enum class Platform {
     Windows,
     Linux,
     Android,
-    iPhone,
+    iOS
 };
 
 Platform platform();