From 3d86aa8f7188bee865bd286fa7dffd80a5c78215 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Date: Fri, 16 Apr 2010 16:21:58 +0200
Subject: QMenu: Behavior regression

When opening a submenu, and then moving the mouse over the parent menu
margins, the submenu would close, whereas it didn't in 4.5.

Reviewed-by: Olivier
Task-number: QTBUG-9785
---
 src/gui/widgets/qmenu.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index c7573bf..d0ae90c 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()) {
-- 
cgit v0.12