diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 09:55:57 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 09:55:57 +0200 |
| commit | 84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37 (patch) | |
| tree | 0a3416b8f4281939de96f799ea06e91e56fe05cf /src/gui/widgets | |
| parent | 1f12c4824942949f3c030f7b2afd44cfac215417 (diff) | |
| parent | 3d86aa8f7188bee865bd286fa7dffd80a5c78215 (diff) | |
| download | qt4-tools-84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMenu: Behavior regression
Mac: Graphics View starving user events and sometimes crashes.
Fixed a crash on Windows 7 systems with invalid PrinterPorts entries.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index c7573bf0aa..d0ae90c83c 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2813,7 +2813,9 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) QAction *action = d->actionAt(e->pos()); if (!action) { - if (d->hasHadMouse) + if (d->hasHadMouse + && (!d->currentAction + || !(d->currentAction->menu() && d->currentAction->menu()->isVisible()))) d->setCurrentAction(0); return; } else if(e->buttons()) { |