1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: enable the new event dispatcher for qtcore

Browse Source 
Use the new event dispatcher for all non-GUI threads,
nn practice for the main thread when using QCoreApplication,
and when calling QThread::exec().

Change-Id: I9184d52532e06da7e6a87ee27c7d53e0d15e693a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Morten Johan Sørvig 2021-08-18 14:54:11 +02:00
parent ecb92aacab
commit 89cda52d66
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/thread/qthread_unix.cpp
View File

@ -47,6 +47,8 @@
#if defined(Q_OS_DARWIN) #if defined(Q_OS_DARWIN)
# include <private/qeventdispatcher_cf_p.h> # include <private/qeventdispatcher_cf_p.h>
#elif defined(Q_OS_WASM)
# include <private/qeventdispatcher_wasm_p.h>
#else #else
# if !defined(QT_NO_GLIB) # if !defined(QT_NO_GLIB)
# include "../kernel/qeventdispatcher_glib_p.h" # include "../kernel/qeventdispatcher_glib_p.h"
@ -250,6 +252,8 @@ QAbstractEventDispatcher *QThreadPrivate::createEventDispatcher(QThreadData *dat
return new QEventDispatcherCoreFoundation; return new QEventDispatcherCoreFoundation;
else else
return new QEventDispatcherUNIX; return new QEventDispatcherUNIX;
#elif defined(Q_OS_WASM)
return new QEventDispatcherWasm();
#elif !defined(QT_NO_GLIB) #elif !defined(QT_NO_GLIB)
const bool isQtMainThread = data->thread.loadAcquire() == QCoreApplicationPrivate::mainThread(); const bool isQtMainThread = data->thread.loadAcquire() == QCoreApplicationPrivate::mainThread();
if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") if (qEnvironmentVariableIsEmpty("QT_NO_GLIB")