diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-16 23:00:21 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-16 23:00:21 (GMT) |
| commit | 432cd48a777fddc04f4c323df5876bcc6c0c2829 (patch) | |
| tree | 75f9580022edbe6715e8203aecb8907611d6ebbd /src/gui/kernel | |
| parent | c70b1afe694b0d32ece6b639b1e4d10501df8bb0 (diff) | |
| parent | 640aad736476f7f8a4ec92fedecae234fb2e2d2e (diff) | |
| download | Qt-432cd48a777fddc04f4c323df5876bcc6c0c2829.zip Qt-432cd48a777fddc04f4c323df5876bcc6c0c2829.tar.gz Qt-432cd48a777fddc04f4c323df5876bcc6c0c2829.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 6 |
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); + } } } |