summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-16 15:52:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-16 15:52:47 (GMT)
commit51bf60d7c79f94cee293aa9dbdc33da60327aaf7 (patch)
tree354edf664d8f26945da7a04847c296c1ae01fa40 /src
parenta211d4cdeea830949e4de647f5ec850bb030212e (diff)
parentf0347c8c0c37bd90dcaefb8f4b669096f7eb66b5 (diff)
downloadQt-51bf60d7c79f94cee293aa9dbdc33da60327aaf7.zip
Qt-51bf60d7c79f94cee293aa9dbdc33da60327aaf7.tar.gz
Qt-51bf60d7c79f94cee293aa9dbdc33da60327aaf7.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: Improved orientation change autotest Avoid duplicate resize event
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 6db1fa8..181fcc7 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1174,8 +1174,10 @@ void QSymbianControl::SizeChanged()
if (!slowResize && tlwExtra)
tlwExtra->inTopLevelResize = false;
} else {
- QResizeEvent *e = new QResizeEvent(newSize, oldSize);
- QApplication::postEvent(qwidget, e);
+ if (!qwidget->testAttribute(Qt::WA_PendingResizeEvent)) {
+ QResizeEvent *e = new QResizeEvent(newSize, oldSize);
+ QApplication::postEvent(qwidget, e);
+ }
}
}