diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-06-29 14:10:51 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-06-29 14:11:15 (GMT) |
| commit | 2f85cc0cb758b0efe4d7b5af1b79eda13be970f3 (patch) | |
| tree | c54cab37a367b18cde6a3f909dbec336465ba71f /src/gui/widgets/qmenu.cpp | |
| parent | d4a80a0161be902aaf0981aa7399b29402a67e5e (diff) | |
| download | Qt-2f85cc0cb758b0efe4d7b5af1b79eda13be970f3.zip Qt-2f85cc0cb758b0efe4d7b5af1b79eda13be970f3.tar.gz Qt-2f85cc0cb758b0efe4d7b5af1b79eda13be970f3.tar.bz2 | |
Fix some coverity warnings
Diffstat (limited to 'src/gui/widgets/qmenu.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 0aa584f..56b8cb1 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -150,7 +150,6 @@ private: void QMenuPrivate::init() { Q_Q(QMenu); - activationRecursionGuard = false; #ifndef QT_NO_WHATSTHIS q->setAttribute(Qt::WA_CustomWhatsThis); #endif @@ -2712,7 +2711,7 @@ void QMenu::mouseMoveEvent(QMouseEvent *e) d->motions++; if (d->motions == 0) // ignore first mouse move event (see enterEvent()) return; - d->hasHadMouse |= rect().contains(e->pos()); + d->hasHadMouse = d->hasHadMouse || rect().contains(e->pos()); QAction *action = d->actionAt(e->pos()); if (!action) { |