summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-15 18:25:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-15 18:25:16 (GMT)
commit540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b (patch)
tree6d91b8bbed9456ae618f00076dfd8953875e2c47
parent7383d4c2d350ee0ac052e2ab3fe7b63ea1eb0185 (diff)
parentc37f058e5d1a548cf322e90e87ff5be20050ab11 (diff)
downloadQt-540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b.zip
Qt-540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b.tar.gz
Qt-540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
-rw-r--r--src/gui/kernel/qapplication_s60.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 81fa4e6..6db1fa8 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -667,9 +667,6 @@ void QSymbianControl::HandleStatusPaneSizeChange()
{
QS60MainAppUi *s60AppUi = static_cast<QS60MainAppUi *>(S60->appUi());
s60AppUi->HandleStatusPaneSizeChange();
- // Send resize event to trigger desktopwidget workAreaResized signal
- QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
- QApplication::sendEvent(qt_desktopWidget, &e);
}
#endif
@@ -1310,6 +1307,9 @@ void QSymbianControl::HandleResourceChange(int resourceType)
case KEikDynamicLayoutVariantSwitch:
{
handleClientAreaChange();
+ // Send resize event to trigger desktopwidget workAreaResized signal
+ QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
+ QApplication::sendEvent(qt_desktopWidget, &e);
break;
}
#endif