diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-21 14:40:42 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-21 14:40:42 (GMT) |
| commit | 7807d804c85b0978cd3e1e3325abbd16dabd2ae0 (patch) | |
| tree | 558c75b2b7f1f101a0e472b6ad6f808b3d2c06aa /src/gui/widgets | |
| parent | c74dac2a0ef5d1b428c4da4e48fab05f9886233a (diff) | |
| parent | c24bff633684b99d05e28bd4926e557fb553cf75 (diff) | |
| download | Qt-7807d804c85b0978cd3e1e3325abbd16dabd2ae0.zip Qt-7807d804c85b0978cd3e1e3325abbd16dabd2ae0.tar.gz Qt-7807d804c85b0978cd3e1e3325abbd16dabd2ae0.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
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 f9b132e..b1a9b48 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2803,7 +2803,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()) { |