summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-05-20 13:45:36 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-05-20 13:45:55 +0200
commitaf4e5576f4dcca16a3ca32bc13a948893a865f19 (patch)
treea29c27b7820fb1054880500e50f4e7b3468e3ac3 /src/gui/kernel/qwindow.cpp
parentd8d6bfb81e0c52d9b39c7b9f4c18f17ba95593f6 (diff)
Added QGuiApplication::activeWindow().
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
-rw-r--r--src/gui/kernel/qwindow.cpp3
1 files changed, 3 insertions, 0 deletions
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();
}