summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-09-19 21:08:36 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-21 12:07:19 +0200
commit21747af805317c93c98fe681200732b14e79ab5b (patch)
treeb716ddabb4f6a954165729bc2646acfb02a295e5
parentc835b98e8ff39ab4331ae8133e358e5dbba9a641 (diff)
Return the correct geometry
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>
-rw-r--r--src/gui/kernel/qwindow.cpp2
1 files changed, 2 insertions, 0 deletions
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;
}