Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 8 insertions, 30 deletions

diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm
index 3dd9c7ad9f..51eb10d385 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm
+++ b/src/plugins/platforms/ios/qioseventdispatcher.mm
@@ -446,6 +446,8 @@ bool __attribute__((returns_twice)) QIOSEventDispatcher::processEvents(QEventLoo
     if (!m_processEventCallsAfterExec && (flags & QEventLoop::EventLoopExec)) {
         ++m_processEventCallsAfterExec;
 
+        m_runLoopExitObserver.addToMode(kCFRunLoopCommonModes);
+
         // We set a new jump point here that we can return to when the event loop
         // is asked to exit, so that we can return from QEventLoop::exec().
         switch (setjmp(processEventExitJumpPoint)) {
@@ -475,44 +477,18 @@ bool __attribute__((returns_twice)) QIOSEventDispatcher::processEvents(QEventLoo
     if (m_processEventCallsAfterExec)
         --m_processEventCallsAfterExec;
 
-    // If we're running with nested event loops and the application is quit,
-    // then the forwarded interrupt call will happen while our processEvent
-    // counter is still 2, and we won't detect that we're about to fall down
-    // to the root iOS run-loop. We do an extra check here to catch that case.
-    checkIfEventLoopShouldExit();
-
     return processedEvents;
 }
 
-void QIOSEventDispatcher::interrupt()
-{
-    QEventDispatcherCoreFoundation::interrupt();
-
-    if (!rootLevelRunLoopIntegration())
-        return;
-
-    // If an interrupt happens as part of a non-nested event loop, that is,
-    // by processing an event or timer in the root iOS run-loop, we'll be
-    // able to detect it here.
-    checkIfEventLoopShouldExit();
-}
-
-void QIOSEventDispatcher::checkIfEventLoopShouldExit()
-{
-    if (m_processEventCallsAfterExec == 1) {
-        qEventDispatcherDebug() << "Hit root runloop level, watching for runloop exit";
-        m_runLoopExitObserver.addToMode(kCFRunLoopCommonModes);
-    }
-}
-
 void QIOSEventDispatcher::handleRunLoopExit(CFRunLoopActivity activity)
 {
     Q_UNUSED(activity);
     Q_ASSERT(activity == kCFRunLoopExit);
 
-    m_runLoopExitObserver.removeFromMode(kCFRunLoopCommonModes);
-
-    interruptEventLoopExec();
+    if (m_processEventCallsAfterExec == 1 && !QThreadData::current()->eventLoops.top()->isRunning()) {
+        qEventDispatcherDebug() << "Root runloop level exited";
+        interruptEventLoopExec();
+    }
 }
 
 void QIOSEventDispatcher::interruptEventLoopExec()
@@ -521,6 +497,8 @@ void QIOSEventDispatcher::interruptEventLoopExec()
 
     --m_processEventCallsAfterExec;
 
+    m_runLoopExitObserver.removeFromMode(kCFRunLoopCommonModes);
+
     // We re-set applicationProcessEventsReturnPoint here so that future
     // calls to QEventLoop::exec() will end up back here after entering
     // processEvents, instead of back in didFinishLaunchingWithOptions.