Fix translation of multiple pressed mouse buttons

We were reporting any mouse button event where the left mouse button was
held as a left mouse button event. We should instead separate the button
changed and the ones held.

Also adds test of the translation.

Change-Id: I1139d6615d54a036dfe843fdb1d1c90b23b467b5
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 2e6fde214..da230479a 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -483,11 +483,11 @@ static inline double currentTimeForEvent(const QInputEvent* event)
 
 static WebMouseEvent::Button mouseButtonForEvent(QMouseEvent *event)
 {
-    if (event->button() == Qt::LeftButton || (event->buttons() & Qt::LeftButton))
+    if (event->button() == Qt::LeftButton)
         return WebMouseEvent::ButtonLeft;
-    else if (event->button() == Qt::RightButton || (event->buttons() & Qt::RightButton))
+    else if (event->button() == Qt::RightButton)
         return WebMouseEvent::ButtonRight;
-    else if (event->button() == Qt::MidButton || (event->buttons() & Qt::MidButton))
+    else if (event->button() == Qt::MidButton)
         return WebMouseEvent::ButtonMiddle;
     return WebMouseEvent::ButtonNone;
 }