From 98c1a46a7dc873f9561cf9d1e6aea09efdf6ab73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Fri, 30 Aug 2024 16:15:18 +0200 Subject: [PATCH] wams: disable delayed onload/first frame features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit requestUpdateHold was not getting enabled properly in some cases, in particular when using a custom html file to load the application. The assert on g_mainThreadEnvetDispatcher is also asserting, with a following dereference of a null pointer. Change-Id: Ibf77d90b84f8319a894e2df34a134d2e4265fe05 Reviewed-by: Piotr Wierciński (cherry picked from commit 10afdc339e08ce1e6a8173df97a3f2edeb27cb57) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qeventdispatcher_wasm.cpp | 3 --- src/plugins/platforms/wasm/qwasmcompositor.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp index 4aa435b64b0..e1ec858ef04 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm.cpp +++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp @@ -931,9 +931,6 @@ void QEventDispatcherWasm::callOnLoadedIfRequired() if (qtLoadedCalled) return; qtLoadedCalled = true; - - Q_ASSERT(g_mainThreadEventDispatcher); - g_mainThreadEventDispatcher->onLoaded(); } void QEventDispatcherWasm::onLoaded() diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 0e2cbf8c0c6..d6017494724 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -12,7 +12,7 @@ using namespace emscripten; -bool QWasmCompositor::m_requestUpdateHoldEnabled = true; +bool QWasmCompositor::m_requestUpdateHoldEnabled = false; QWasmCompositor::QWasmCompositor(QWasmScreen *screen) : QObject(screen) {