From 21747af805317c93c98fe681200732b14e79ab5b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 19 Sep 2011 21:08:36 +0200
Subject: Return the correct geometry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the platform window is created, it is the
authorative source for geometry information.

It would however be better if we could completely
avoid duplicated places for the geometry data.

Change-Id: Id90b24b9c40acb57f3d11b8b927292c06bac335e
Reviewed-on: http://codereview.qt-project.org/5258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/kernel/qwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index d8e0288dc7..b0faed7992 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -425,6 +425,8 @@ void QWindow::setGeometry(const QRect &rect)
 QRect QWindow::geometry() const
 {
     Q_D(const QWindow);
+    if (d->platformWindow)
+        return d->platformWindow->geometry();
     return d->geometry;
 }
 
-- 
cgit v1.2.3