diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 13:36:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 13:36:38 (GMT) |
| commit | 77f7da2f74f7c051aa6e8f842e35f7645ca5070f (patch) | |
| tree | b0d93c7c46fb00c5cc104fb0b11072392d7791ac | |
| parent | 447b3a1ee4dd13a37dc3674926464f36f674cbeb (diff) | |
| parent | e9b3c429337a3ddc144aa1f39d40cd8dd151a566 (diff) | |
| download | Qt-77f7da2f74f7c051aa6e8f842e35f7645ca5070f.zip Qt-77f7da2f74f7c051aa6e8f842e35f7645ca5070f.tar.gz Qt-77f7da2f74f7c051aa6e8f842e35f7645ca5070f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index c099273..9732c7e 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -177,11 +177,14 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e) // Alt has been pressed - find all widgets that care QList<QWidget *> l = widget->findChildren<QWidget *>(); - for (int pos=0 ; pos < l.size() ; ++pos) { + for (int pos=0 ; pos < l.size() ;) { QWidget *w = l.at(pos); if (w->isWindow() || !w->isVisible() || - w->style()->styleHint(SH_UnderlineShortcut, 0, w)) + w->style()->styleHint(SH_UnderlineShortcut, 0, w)) { l.removeAt(pos); + continue; + } + pos++; } // Update states before repainting d->seenAlt.append(widget); |