2 files changed, 15 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
index 24e76f05d6..ab8bacc1c7 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa.cpp
+++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp
@@ -114,6 +114,10 @@ bool QWidgetWindow::event(QEvent *event)
         handleExposeEvent(static_cast<QExposeEvent *>(event));
         return true;
 
+    case QEvent::WindowStateChange:
+        handleWindowStateChangedEvent(static_cast<QWindowStateChangeEvent *>(event));
+        return true;
+
     default:
         break;
     }
@@ -385,4 +389,14 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
     m_widget->d_func()->syncBackingStore(event->region());
 }
 
+void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event)
+{
+    // QWindow does currently not know 'active'.
+    Qt::WindowStates eventState = event->oldState();
+    if (m_widget->windowState() & Qt::WindowActive)
+        eventState |= Qt::WindowActive;
+    QWindowStateChangeEvent widgetEvent(eventState);
+    QGuiApplication::sendSpontaneousEvent(m_widget, &widgetEvent);
+}
+
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h
index f200839b0b..4253072933 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa_p.h
+++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h
@@ -76,6 +76,7 @@ protected:
     void handleWheelEvent(QWheelEvent *);
     void handleDragEvent(QEvent *);
     void handleExposeEvent(QExposeEvent *);
+    void handleWindowStateChangedEvent(QWindowStateChangeEvent *event);
 
 private:
     void updateGeometry();