diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-02 07:38:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-02 07:38:39 (GMT) |
| commit | 2c4a5cee336aba5f2da52ac4c59b502cf4d82164 (patch) | |
| tree | dc7857f6d2342b85099a799faafaa863fb36a516 /src/gui/widgets/qmenu.cpp | |
| parent | 576cb12c36f24917d674f4c0bf240441b4ac9b43 (diff) | |
| parent | f101d46ccd4795fc672b5b6c9e24151df319d725 (diff) | |
| download | Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.zip Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.tar.gz Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/gui/widgets/qmenu.cpp')
| -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 e0f1402..4698be4 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()) { |