diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 14:14:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-27 14:14:32 (GMT) |
| commit | 3e85059d3bd7fe1b6c4a7a7bc9b0faaf65eb0b20 (patch) | |
| tree | 2eba8bb29b4b6ff7404938c28dfe38e2843bcf2d /src/gui/styles | |
| parent | 88a41bd9d0ff69dbf5695644643967ddc9b34ddf (diff) | |
| parent | 8382808771e73a599deee2af536ae3aba75dc6f9 (diff) | |
| download | Qt-3e85059d3bd7fe1b6c4a7a7bc9b0faaf65eb0b20.zip Qt-3e85059d3bd7fe1b6c4a7a7bc9b0faaf65eb0b20.tar.gz Qt-3e85059d3bd7fe1b6c4a7a7bc9b0faaf65eb0b20.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Check if bridge plugin vector is still valid.
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
Diffstat (limited to 'src/gui/styles')
| -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); |