summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-26 20:05:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-26 20:05:55 (GMT)
commitf54d9e2ea84c59b7767696a64e9f02e0ad940275 (patch)
tree633becfb804531dec0c2c06412205ad6a1c69de5 /src/gui
parentc0f415bdea15c7382800829bd5f5683aa7cd99ec (diff)
parent2ccf2a09653d25c87e9a50dc842d2aff54fa914c (diff)
downloadQt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.zip
Qt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.tar.gz
Qt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list QRuntimeWindowSystem: Track window size properly
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qgraphicssystem_runtime.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index 0294c4b..5841d40 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -285,6 +285,7 @@ void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion &region,
void QRuntimeWindowSurface::setGeometry(const QRect &rect)
{
+ QWindowSurface::setGeometry(rect);
m_windowSurface->setGeometry(rect);
}