From af4e5576f4dcca16a3ca32bc13a948893a865f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 20 May 2011 13:45:36 +0200
Subject: Added QGuiApplication::activeWindow().

---
 src/gui/kernel/qwindow.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/gui/kernel/qwindow.cpp')

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 3ff7d6c998..fef579b6b0 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -62,6 +62,8 @@ QWindow::QWindow(QWindow *parent)
 
 QWindow::~QWindow()
 {
+    if (QGuiApplicationPrivate::active_window == this)
+        QGuiApplicationPrivate::active_window = 0;
     destroy();
 }
 
@@ -259,6 +261,7 @@ void QWindow::setOpacity(qreal level)
 void QWindow::requestActivateWindow()
 {
     Q_D(QWindow);
+    QGuiApplicationPrivate::active_window = this;
     if (d->platformWindow) {
         d->platformWindow->requestActivateWindow();
     }
-- 
cgit v1.2.3