Merge remote-tracking branch 'origin/5.14.2' into 5.14

Change-Id: I11019c23d949af45f0be814ab894dee602fb1b1a

1 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index f8eaa39f76..69f58013e7 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -108,8 +108,9 @@ QWasmIntegration::QWasmIntegration()
     s_instance = this;
 
     // We expect that qtloader.js has populated Module.qtCanvasElements with one or more canvases.
+    // Also check Module.canvas, which may be set if the emscripen or a custom loader is used.
     emscripten::val qtCanvaseElements = val::module_property("qtCanvasElements");
-    emscripten::val canvas = val::module_property("canvas"); // TODO: remove for Qt 6.0
+    emscripten::val canvas = val::module_property("canvas");
 
     if (!qtCanvaseElements.isUndefined()) {
         int screenCount = qtCanvaseElements["length"].as<int>();
@@ -118,9 +119,7 @@ QWasmIntegration::QWasmIntegration()
             QString canvasId = QWasmString::toQString(canvas["id"]);
             addScreen(canvasId);
         }
-    } else if (!canvas.isUndefined()) {
-        qWarning() << "Module.canvas is deprecated. A future version of Qt will stop reading this property. "
-                   << "Instead, set Module.qtCanvasElements to be an array of canvas elements, or use qtloader.js.";
+    } else if (!canvas.isUndefined()){
         QString canvasId = QWasmString::toQString(canvas["id"]);
         addScreen(canvasId);
     }
@@ -140,7 +139,7 @@ QWasmIntegration::QWasmIntegration()
             integration->resizeAllScreens();
         return 0;
     };
-    emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, nullptr, 1, onWindowResize);
+    emscripten_set_resize_callback(nullptr, nullptr, 1, onWindowResize);
 }
 
 QWasmIntegration::~QWasmIntegration()