diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 10:04:36 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 10:04:36 (GMT) |
| commit | a5188742e4666f5181f85745677abfbf9e658076 (patch) | |
| tree | 9f6727e1db197768e5d2f2c6d38aa7f087b1636f /src/gui/widgets | |
| parent | 0015e9ba53ab0e6a7005b18823513aec63df6939 (diff) | |
| parent | a6b28c1c73e33d779de8c905be935c014704b379 (diff) | |
| download | Qt-a5188742e4666f5181f85745677abfbf9e658076.zip Qt-a5188742e4666f5181f85745677abfbf9e658076.tar.gz Qt-a5188742e4666f5181f85745677abfbf9e658076.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
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 b5348f2..2b098c0 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2262,7 +2262,7 @@ void QMenu::mouseReleaseEvent(QMouseEvent *e) break; } } - if (e->button() || isContextMenu) + if (e->button() == Qt::LeftButton || isContextMenu) #endif d->activateAction(action, QAction::Trigger); } |