summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-25 08:34:57 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-25 08:37:18 (GMT)
commitf729015e1f44065b1b1911b65ba3fddd35d5545b (patch)
tree461242ebaf27abf65de0daa0963c8fb322ae7fe2
parenta5a215eefff176eda3b1bb97ee70abfbab20f054 (diff)
downloadQt-f729015e1f44065b1b1911b65ba3fddd35d5545b.zip
Qt-f729015e1f44065b1b1911b65ba3fddd35d5545b.tar.gz
Qt-f729015e1f44065b1b1911b65ba3fddd35d5545b.tar.bz2
QMenu: make no active action when the mouse leaves the menu
Task-number: 260111
-rw-r--r--src/gui/widgets/qmenu.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 69ccae5..92d1271 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -2779,6 +2779,8 @@ void QMenu::leaveEvent(QEvent *)
d->sloppyAction = 0;
if (!d->sloppyRegion.isEmpty())
d->sloppyRegion = QRegion();
+ if (!d->activeMenu && d->currentAction)
+ setActiveAction(0);
}
/*!