From 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Fri, 5 Apr 2019 14:12:34 +1000 Subject: wasm: use requestActive instead of activate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-74868 Change-Id: Ibbbac1ece66c8978440a282bf6949a82fb64d216 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmeventtranslator.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms/wasm') 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); -- cgit v1.2.3 From 837c80bad3242ee9a6e73fda9adf9cfbeb8dd9fe Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 2 May 2019 09:58:07 +1000 Subject: wasm: fix passing environmental variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-75530 Change-Id: Ic0f0bd8ce863f55d737d96bbf9e5473466381c9b Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qtloader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms/wasm') 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; } }); -- cgit v1.2.3