diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-10-01 17:30:52 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-09 11:50:53 +0200 |
commit | 2043adf97ce90b70a98e03e85513387e49ed66d0 (patch) | |
tree | b75e8c117a685af5f72b9c7cb18ca13bc7ab1ee7 /src/plugins/platforms/ios/qioseventdispatcher.h | |
parent | 54c5a79fd0d711dd30c8813b7c5b3ce23e7429ef (diff) |
iOS: Generalize jumping event-dispatcher to handle QEventLoop:exec()
We already supported re-entering QApplication::exec(), so adding support
for handling a generalized QEventLoop::exec() was nothing more than
removing the qApplication->in_exec condition in processEvents() and
the QThreadData::current()->quitNow condition when interrupting the
event loop. Everything else is just renaming and rewording, now that
the feature is not specific to QApplication::exec().
This means dialogs such as QFileDialog opened in the main() function
will show something on screen, as we then fall back to the iOS root
run-loop handling, while at the same time supporting QApplication
exec once the dialog closes.
We still don't hadle recursive QEventLoop:exec() at the root level,
as that would require multiple stacks and detailed application
knowledge about when to create them.
Change-Id: I334a362d85796341a343ce82f3104ff5866bdc3f
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qioseventdispatcher.h')
-rw-r--r-- | src/plugins/platforms/ios/qioseventdispatcher.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/plugins/platforms/ios/qioseventdispatcher.h index 83267e80ea..f2272ecd68 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.h +++ b/src/plugins/platforms/ios/qioseventdispatcher.h @@ -58,11 +58,11 @@ public: void handleRunLoopExit(CFRunLoopActivity activity); - void checkIfApplicationShouldQuit(); - void interruptQApplicationExec(); + void checkIfEventLoopShouldExit(); + void interruptEventLoopExec(); private: - uint m_processEventCallsAfterAppExec; + uint m_processEventCallsAfterExec; RunLoopObserver<QIOSEventDispatcher> m_runLoopExitObserver; }; |