7 files changed, 35 insertions, 12 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index bdedc9d75f..f0ef39e809 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1528,8 +1528,9 @@ void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePriv
     case QWindowSystemInterfacePrivate::WindowScreenChanged:
         QGuiApplicationPrivate::processWindowScreenChangedEvent(static_cast<QWindowSystemInterfacePrivate::WindowScreenChangedEvent *>(e));
         break;
-    case QWindowSystemInterfacePrivate::ApplicationStateChanged:
-        QGuiApplicationPrivate::setApplicationState(static_cast<QWindowSystemInterfacePrivate::ApplicationStateChangedEvent *>(e)->newState);
+    case QWindowSystemInterfacePrivate::ApplicationStateChanged: {
+        QWindowSystemInterfacePrivate::ApplicationStateChangedEvent * changeEvent = static_cast<QWindowSystemInterfacePrivate::ApplicationStateChangedEvent *>(e);
+        QGuiApplicationPrivate::setApplicationState(changeEvent->newState, changeEvent->forcePropagate); }
         break;
     case QWindowSystemInterfacePrivate::FlushEvents:
         QWindowSystemInterface::deferredFlushWindowSystemEvents();
@@ -2834,9 +2835,9 @@ Qt::ApplicationState QGuiApplication::applicationState()
     \sa applicationState()
 */
 
-void QGuiApplicationPrivate::setApplicationState(Qt::ApplicationState state)
+void QGuiApplicationPrivate::setApplicationState(Qt::ApplicationState state, bool forcePropagate)
 {
-    if (applicationState == state)
+    if ((applicationState == state) && !forcePropagate)
         return;
 
     applicationState = state;
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 1ec808ec27..8f6149d1ed 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -288,7 +288,7 @@ public:
 
     static QRect applyWindowGeometrySpecification(const QRect &windowGeometry, const QWindow *window);
 
-    static void setApplicationState(Qt::ApplicationState state);
+    static void setApplicationState(Qt::ApplicationState state, bool forcePropagate = false);
 
 protected:
     virtual void notifyThemeChanged();
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 49ff8bcb0d..c9990b0f4f 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -133,11 +133,11 @@ void QWindowSystemInterface::handleWindowScreenChanged(QWindow *tlw, QScreen *sc
     QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
 }
 
-void QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationState newState)
+void QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationState newState, bool forcePropagate)
 {
     Q_ASSERT(QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ApplicationState));
     QWindowSystemInterfacePrivate::ApplicationStateChangedEvent *e =
-        new QWindowSystemInterfacePrivate::ApplicationStateChangedEvent(newState);
+        new QWindowSystemInterfacePrivate::ApplicationStateChangedEvent(newState, forcePropagate);
     QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
 }
 
diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h
index 71feb1bcb7..eb18245f7b 100644
--- a/src/gui/kernel/qwindowsysteminterface.h
+++ b/src/gui/kernel/qwindowsysteminterface.h
@@ -148,7 +148,7 @@ public:
     static void handleWindowStateChanged(QWindow *w, Qt::WindowState newState);
     static void handleWindowScreenChanged(QWindow *w, QScreen *newScreen);
 
-    static void handleApplicationStateChanged(Qt::ApplicationState newState);
+    static void handleApplicationStateChanged(Qt::ApplicationState newState, bool forcePropagate = false);
 
     static void handleExposeEvent(QWindow *tlw, const QRegion &region);
 
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index 8e503bbf3d..752b3f16cc 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -176,11 +176,12 @@ public:
 
     class ApplicationStateChangedEvent : public WindowSystemEvent {
     public:
-        ApplicationStateChangedEvent(Qt::ApplicationState newState)
-            : WindowSystemEvent(ApplicationStateChanged), newState(newState)
+        ApplicationStateChangedEvent(Qt::ApplicationState newState, bool forcePropagate = false)
+            : WindowSystemEvent(ApplicationStateChanged), newState(newState), forcePropagate(forcePropagate)
         { }
 
         Qt::ApplicationState newState;
+        bool forcePropagate;
     };
 
     class FlushEventsEvent : public WindowSystemEvent {
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
index f8411845dc..d322079cb2 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@@ -333,6 +333,7 @@ static void cleanupCocoaApplicationDelegate()
         && [reflectionDelegate respondsToSelector:@selector(applicationDidBecomeActive:)])
         [reflectionDelegate applicationDidBecomeActive:notification];
 
+    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
 /*
     onApplicationChangedActivation(true);
 
@@ -356,6 +357,7 @@ static void cleanupCocoaApplicationDelegate()
         && [reflectionDelegate respondsToSelector:@selector(applicationDidResignActive:)])
         [reflectionDelegate applicationDidResignActive:notification];
 
+    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
 /*
     onApplicationChangedActivation(false);
 
@@ -367,6 +369,26 @@ static void cleanupCocoaApplicationDelegate()
 */
 }
 
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag
+{
+    Q_UNUSED(theApplication);
+    Q_UNUSED(flag);
+    if (reflectionDelegate
+        && [reflectionDelegate respondsToSelector:@selector(applicationShouldHandleReopen:hasVisibleWindows:)])
+        return [reflectionDelegate applicationShouldHandleReopen:theApplication hasVisibleWindows:flag];
+
+    /*
+       true to force delivery of the event even if the application state is already active,
+       because rapp (handle reopen) events are sent each time the dock icon is clicked regardless
+       of the active state of the application or number of visible windows. For example, a browser
+       app that has no windows opened would need the event be to delivered even if it was already
+       active in order to create a new window as per OS X conventions.
+     */
+    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive, true /*forcePropagate*/);
+
+    return NO;
+}
+
 - (void)setReflectionDelegate:(NSObject <NSApplicationDelegate> *)oldDelegate
 {
     [oldDelegate retain];
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index c4398622e8..e7a973e45b 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -405,14 +405,13 @@ bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) cons
     case MultipleWindows:
     case ForeignWindows:
     case RasterGLSurface:
+    case ApplicationState:
         return true;
     default:
         return QPlatformIntegration::hasCapability(cap);
     }
 }
 
-
-
 QPlatformWindow *QCocoaIntegration::createPlatformWindow(QWindow *window) const
 {
     return new QCocoaWindow(window);