diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-10-08 17:17:44 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-11-03 08:52:39 +0200 |
| commit | e3a5bd3e55916618a0384894d44c70f82870210d (patch) | |
| tree | 2e39653146cdc7f2fcc15b7b36bb483ab1f5816a /src/corelib/kernel | |
| parent | f5eda09a639715036d48a60078e6a379ec151f94 (diff) | |
Add QEventLoop::ProcessEventsFlag::ApplicationExec
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 <lorn.potter@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventloop.h | 3 |
3 files changed, 4 insertions, 2 deletions
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) |