Use == for button flag test instead of &
authorStephen Kelly <stephen.kelly@kdab.com>
Mon, 6 Aug 2012 15:20:35 +0000 (17:20 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 6 Aug 2012 23:01:53 +0000 (01:01 +0200)
QMouseEvent::button() returns Qt::MouseButton, not Qt::MouseButtons.

Change-Id: Ib5dc5b3998ed8f442c72e26d1aff62bc4ebcff71
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
src/widgets/itemviews/qabstractitemview.cpp

index ebfe20c..40aa429 100644 (file)
@@ -1845,7 +1845,7 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event)
     }
 
     bool click = (index == d->pressedIndex && index.isValid());
-    bool selectedClicked = click && (event->button() & Qt::LeftButton) && d->pressedAlreadySelected;
+    bool selectedClicked = click && (event->button() == Qt::LeftButton) && d->pressedAlreadySelected;
     EditTrigger trigger = (selectedClicked ? SelectedClicked : NoEditTriggers);
     bool edited = edit(index, trigger, event);
 
@@ -1892,7 +1892,7 @@ void QAbstractItemView::mouseDoubleClickEvent(QMouseEvent *event)
     // signal handlers may change the model
     QPersistentModelIndex persistent = index;
     emit doubleClicked(persistent);
-    if ((event->button() & Qt::LeftButton) && !edit(persistent, DoubleClicked, event)
+    if ((event->button() == Qt::LeftButton) && !edit(persistent, DoubleClicked, event)
         && !style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, this))
         emit activated(persistent);
 }