summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-10 09:21:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-10 09:21:09 (GMT)
commitf07d637dfe39a3887c1c2374f0543e19d885ff90 (patch)
tree3b1711bc5b5cf05afa8292ca1d9b10d0b81e5d94 /src/gui
parent796010e822884a895eaf1597f4ae20eb2c0ac926 (diff)
parent5bb3af94428d85c9d08b3c4cfb31c4071604b06d (diff)
downloadQt-f07d637dfe39a3887c1c2374f0543e19d885ff90.zip
Qt-f07d637dfe39a3887c1c2374f0543e19d885ff90.tar.gz
Qt-f07d637dfe39a3887c1c2374f0543e19d885ff90.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: Fix dialog position adjustment regression in Symbian SSL readbuffer 16->32 kB
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index d3b0e99..b5db3d0 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1518,6 +1518,11 @@ void QSymbianControl::HandleResourceChange(int resourceType)
QResizeEvent e(qt_desktopWidget->size(), qt_desktopWidget->size());
QApplication::sendEvent(qt_desktopWidget, &e);
}
+ // Send resize event to dialogs so they can adjust their position if necessary.
+ if (qwidget->windowType() & Qt::Dialog) {
+ QResizeEvent e(qwidget->size(), qwidget->size());
+ QApplication::sendEvent(qwidget, &e);
+ }
break;
}
#endif