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

Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567

3 files changed, 21 insertions, 13 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
index 0274ed8201..de6c6585e9 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
@@ -134,6 +134,8 @@ public:
     void interrupt();
     void flush();
 
+    bool event(QEvent *);
+
     friend void qt_mac_maybeCancelWaitForMoreEventsForwarder(QAbstractEventDispatcher *eventDispatcher);
 };
 
@@ -163,7 +165,6 @@ public:
     // The following variables help organizing modal sessions:
     QStack<QCocoaModalSessionInfo> cocoaModalSessionStack;
     bool currentExecIsNSAppRun;
-    bool modalSessionOnNSAppRun;
     bool nsAppRunCalledByQt;
     bool cleanupModalSessionsNeeded;
     uint processEventsCalled;
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index 495a54cac4..e0ce9f9648 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -734,13 +734,25 @@ void QCocoaEventDispatcherPrivate::beginModalSession(QWindow *window)
     updateChildrenWorksWhenModal();
     currentModalSessionCached = 0;
     if (currentExecIsNSAppRun) {
-        modalSessionOnNSAppRun = true;
-        q->wakeUp();
+        QEvent *e = new QEvent(QEvent::User);
+        qApp->postEvent(q, e, Qt::HighEventPriority);
     } else {
         q->interrupt();
     }
 }
 
+bool QCocoaEventDispatcher::event(QEvent *e)
+{
+    Q_D(QCocoaEventDispatcher);
+
+    if (e->type() == QEvent::User) {
+        d->q_func()->processEvents(QEventLoop::DialogExec | QEventLoop::EventLoopExec | QEventLoop::WaitForMoreEvents);
+        return true;
+    }
+
+    return QObject::event(e);
+}
+
 void QCocoaEventDispatcherPrivate::endModalSession(QWindow *window)
 {
     Q_Q(QCocoaEventDispatcher);
@@ -777,7 +789,6 @@ QCocoaEventDispatcherPrivate::QCocoaEventDispatcherPrivate()
       runLoopTimerRef(0),
       blockSendPostedEvents(false),
       currentExecIsNSAppRun(false),
-      modalSessionOnNSAppRun(false),
       nsAppRunCalledByQt(false),
       cleanupModalSessionsNeeded(false),
       processEventsCalled(0),
@@ -908,14 +919,6 @@ void QCocoaEventDispatcherPrivate::postedEventsSourceCallback(void *info)
         // processEvents() was called "manually," ignore this source for now
         d->maybeCancelWaitForMoreEvents();
         return;
-    } else if (d->modalSessionOnNSAppRun) {
-        // We're about to spawn the 1st modal session on top of the main runloop.
-        // Instead of calling processPostedEvents(), which would need us stop
-        // NSApp, we just re-enter processEvents(). This is equivalent to calling
-        // QDialog::exec() except that it's done in a non-blocking way.
-        d->modalSessionOnNSAppRun = false;
-        d->q_func()->processEvents(QEventLoop::DialogExec | QEventLoop::EventLoopExec | QEventLoop::WaitForMoreEvents);
-        return;
     }
     d->processPostedEvents();
     d->maybeCancelWaitForMoreEvents();
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index e2572d607a..5d20764c87 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -680,8 +680,12 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
     if (m_platformWindow->m_activePopupWindow) {
         QWindowSystemInterface::handleCloseEvent(m_platformWindow->m_activePopupWindow);
         QWindowSystemInterface::flushWindowSystemEvents();
+        Qt::WindowType type = m_platformWindow->m_activePopupWindow->type();
         m_platformWindow->m_activePopupWindow = 0;
-        return;
+        // Consume the mouse event when closing the popup, except for tool tips
+        // were it's expected that the event is processed normally.
+        if (type != Qt::ToolTip)
+            return;
     }
     if ([self hasMarkedText]) {
         NSInputManager* inputManager = [NSInputManager currentInputManager];