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

Remove the unix dispatcher from WASM builds

Browse Source 
Unix dispatcher is not used and - as such - redundant on WASM.

Change-Id: Ia8789ef783b06ce9cfba2ce9d67159db2355b594
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
This commit is contained in:
Mikolaj Boc 2023-07-31 15:42:35 +02:00
parent 462904d46b
commit 234f03a0b3
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/CMakeLists.txt
View File

@ -659,12 +659,16 @@ qt_internal_extend_target(Core CONDITION UNIX
io/qfsfileengine_unix.cpp
io/qlockfile_unix.cpp
kernel/qcore_unix.cpp kernel/qcore_unix_p.h
kernel/qeventdispatcher_unix.cpp kernel/qeventdispatcher_unix_p.h
kernel/qpoll_p.h
kernel/qtimerinfo_unix.cpp kernel/qtimerinfo_unix_p.h
thread/qthread_unix.cpp
)
qt_internal_extend_target(Core CONDITION UNIX AND NOT WASM
SOURCES
kernel/qeventdispatcher_unix.cpp kernel/qeventdispatcher_unix_p.h
)
qt_internal_extend_target(Core CONDITION QT_FEATURE_thread
SOURCES
thread/qatomic.cpp

4
src/corelib/kernel/qcoreapplication.cpp
View File

@ -56,7 +56,9 @@
# include "qeventdispatcher_glib_p.h"
# endif
# endif
# include "qeventdispatcher_unix_p.h"
# if !defined(Q_OS_WASM)
# include "qeventdispatcher_unix_p.h"
# endif
#endif
#ifdef Q_OS_WIN
#include "qeventdispatcher_win_p.h"

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

@ -20,7 +20,9 @@
# endif
#endif
#include <private/qeventdispatcher_unix_p.h>
#if !defined(Q_OS_WASM)
# include <private/qeventdispatcher_unix_p.h>
#endif
#include "qthreadstorage.h"

2
src/gui/CMakeLists.txt
View File

@ -920,7 +920,7 @@ qt_internal_extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
)
qt_internal_extend_target(Gui CONDITION UNIX
qt_internal_extend_target(Gui CONDITION UNIX AND NOT WASM
SOURCES
platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
platform/unix/qunixeventdispatcher.cpp

3
src/plugins/platforms/wasm/qwasmintegration.cpp
View File

@ -14,9 +14,6 @@
#include "qwasmwindow.h"
#include "qwasmbackingstore.h"
#include "qwasmfontdatabase.h"
#if defined(Q_OS_UNIX)
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#endif
#include <qpa/qplatformwindow.h>
#include <QtGui/qscreen.h>
#include <qpa/qwindowsysteminterface.h>

6
tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
View File

@ -9,7 +9,9 @@
#include <qeventloop.h>
#include <private/qeventloop_p.h>
#if defined(Q_OS_UNIX)
#include <private/qeventdispatcher_unix_p.h>
#if !defined(Q_OS_WASM)
#include <private/qeventdispatcher_unix_p.h>
#endif
#include <QtCore/private/qcore_unix_p.h>
#if defined(HAVE_GLIB)
#include <private/qeventdispatcher_glib_p.h>
@ -486,7 +488,7 @@ void tst_QEventLoop::processEventsExcludeTimers()
// but not if we exclude timers
eventLoop.processEvents(QEventLoop::X11ExcludeTimers);
#if defined(Q_OS_UNIX)
#if defined(Q_OS_UNIX) && !defined(Q_OS_WASM)
QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher();
if (!qobject_cast<QEventDispatcherUNIX *>(eventDispatcher)
#if defined(HAVE_GLIB)