Send ApplicationActivate and ApplicationDeactivate from QtGui.

Instead of only from QApplication in QtWidgets, as we need these events
for example in QDeclarativeApplication.

Task-number: QTBUG-21573
Task-number: QTBUG-23331
Change-Id: I0c960bd1c7911d306d274a6e9a1838f158235ed0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f669a8f3d5..c3dddddf3b 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -753,9 +753,6 @@ void QGuiApplicationPrivate::processLeaveEvent(QWindowSystemInterfacePrivate::Le
 
 void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate::ActivatedWindowEvent *e)
 {
-    if (!e->activated)
-        return;
-
     QWindow *previous = QGuiApplicationPrivate::focus_window;
     QGuiApplicationPrivate::focus_window = e->activated.data();
 
@@ -765,10 +762,18 @@ void QGuiApplicationPrivate::processActivatedEvent(QWindowSystemInterfacePrivate
     if (previous) {
         QFocusEvent focusOut(QEvent::FocusOut);
         QCoreApplication::sendSpontaneousEvent(previous, &focusOut);
+    } else {
+        QEvent appActivate(QEvent::ApplicationActivate);
+        qApp->sendSpontaneousEvent(qApp, &appActivate);
     }
 
-    QFocusEvent focusIn(QEvent::FocusIn);
-    QCoreApplication::sendSpontaneousEvent(QGuiApplicationPrivate::focus_window, &focusIn);
+    if (QGuiApplicationPrivate::focus_window) {
+        QFocusEvent focusIn(QEvent::FocusIn);
+        QCoreApplication::sendSpontaneousEvent(QGuiApplicationPrivate::focus_window, &focusIn);
+    } else {
+        QEvent appActivate(QEvent::ApplicationDeactivate);
+        qApp->sendSpontaneousEvent(qApp, &appActivate);
+    }
 
     if (self)
         self->notifyActiveWindowChange(previous);