From e3a5bd3e55916618a0384894d44c70f82870210d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 8 Oct 2021 17:17:44 +0200 Subject: Add QEventLoop::ProcessEventsFlag::ApplicationExec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The wasm event dispatcher needs to differentiate between top-level QCoreApplication::exec() and QEventLoop::exec() calls. Add the “ApplicationExec” enum value. The value is undocumented, like EventLoopExec and DialogExec. Change-Id: I2924daee39ef85a3ea7e766e317b3071b5d7f541 Reviewed-by: Lorn Potter Reviewed-by: Thiago Macieira --- src/corelib/kernel/qcoreapplication.cpp | 2 +- src/corelib/kernel/qeventloop.cpp | 1 + src/corelib/kernel/qeventloop.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index c980e70dbf..e3530a3393 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1381,7 +1381,7 @@ int QCoreApplication::exec() QEventLoop eventLoop; self->d_func()->in_exec = true; self->d_func()->aboutToQuitEmitted = false; - int returnCode = eventLoop.exec(); + int returnCode = eventLoop.exec(QEventLoop::ApplicationExec); threadData->quitNow = false; if (self) diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 4e4fa11b30..b5304332ad 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -88,6 +88,7 @@ QT_BEGIN_NAMESPACE \omitvalue X11ExcludeTimers \omitvalue EventLoopExec \omitvalue DialogExec + \omitvalue ApplicationExec \sa processEvents() */ diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index 9b83d692fa..f3896bdd62 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -62,7 +62,8 @@ public: WaitForMoreEvents = 0x04, X11ExcludeTimers = 0x08, EventLoopExec = 0x20, - DialogExec = 0x40 + DialogExec = 0x40, + ApplicationExec = 0x80, }; Q_DECLARE_FLAGS(ProcessEventsFlags, ProcessEventsFlag) -- cgit v1.2.3