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

 Conflicts:
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qvariant.h
	src/corelib/tools/qlist.h

Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d

2 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js
index 2db7723ae2..4752a1dcee 100644
--- a/src/plugins/platforms/wasm/qtloader.js
+++ b/src/plugins/platforms/wasm/qtloader.js
@@ -404,7 +404,7 @@ function QtLoader(config)
         Module.preRun = Module.preRun || []
         Module.preRun.push(function() {
             for (var [key, value] of Object.entries(config.environment)) {
-                Module.ENV[key.toUpperCase()] = value;
+                ENV[key.toUpperCase()] = value;
             }
         });
 
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index c5c12e9f87..6a02a457a0 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -568,11 +568,8 @@ void QWasmEventTranslator::processMouse(int eventType, const EmscriptenMouseEven
     switch (eventType) {
     case EMSCRIPTEN_EVENT_MOUSEDOWN:
     {
-        if (window2) {
-            window2->raise();
-            if (!window2->isActive())
-                window2->requestActivate();
-        }
+        if (window2)
+            window2->requestActivate();
 
         pressedButtons.setFlag(button);