From 2043adf97ce90b70a98e03e85513387e49ed66d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 1 Oct 2013 17:30:52 +0200 Subject: 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 --- src/plugins/platforms/ios/qioseventdispatcher.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/ios/qioseventdispatcher.h') 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 m_runLoopExitObserver; }; -- cgit v1.2.3