diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:53:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:53:44 (GMT) |
| commit | 3c67a14ad0db0e83e70b2432394f168ce279518b (patch) | |
| tree | 77ba4c394f39886b21da6645723ebde9253788f2 /src/gui/kernel/qapplication.cpp | |
| parent | b39dc4a9029040f43f1ca3ace6bf7e77740a3f39 (diff) | |
| parent | 007f01a7e801d5409708e4b8de8b3ead1481cf7d (diff) | |
| download | Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.zip Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.tar.gz Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Make it compile with openssl 1.0.0d, gcc 4.6
QStringBuilder: do not crash with null char*
Fix event delevery order
QSocketNotifier autotest - fix compile with MSVC
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 3803599..361ec6d 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1288,8 +1288,8 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis || event->type() == QEvent::LanguageChange || event->type() == QEvent::UpdateSoftKeys || event->type() == QEvent::InputMethod)) { - for (int i = 0; i < postedEvents->size(); ++i) { - const QPostEvent &cur = postedEvents->at(i); + for (QPostEventList::const_iterator it = postedEvents->constBegin(); it != postedEvents->constEnd(); ++it) { + const QPostEvent &cur = *it; if (cur.receiver != receiver || cur.event == 0 || cur.event->type() != event->type()) continue; if (cur.event->type() == QEvent::LayoutRequest |