diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-23 07:55:53 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-23 07:55:53 (GMT) |
| commit | 24bbcd26aebd584a74483abc710841c7f24581b8 (patch) | |
| tree | c98567e9bb86323de8e493032395542bb3564798 /src/gui/widgets | |
| parent | 4780f94e391b5e881497c5228661dead42c821fa (diff) | |
| parent | b38bbdbd30180f6214b4fe33c633e48f0a53f823 (diff) | |
| download | Qt-24bbcd26aebd584a74483abc710841c7f24581b8.zip Qt-24bbcd26aebd584a74483abc710841c7f24581b8.tar.gz Qt-24bbcd26aebd584a74483abc710841c7f24581b8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index f9b132e..c157a2f 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2812,7 +2812,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) if (d->sloppyRegion.contains(e->pos())) { d->sloppyAction = action; QMenuPrivate::sloppyDelayTimer = startTimer(style()->styleHint(QStyle::SH_Menu_SubMenuPopupDelay, 0, this)*6); - } else { + } else if (action != d->currentAction) { d->setCurrentAction(action, style()->styleHint(QStyle::SH_Menu_SubMenuPopupDelay, 0, this)); } } |