Add support for getting the flags from the original mouse event

Change-Id: Ifdf0b8cb43b1e88f3931f49ac6ca72019548ddcf
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

4 files changed, 26 insertions, 6 deletions

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 4a786d5569..260b302121 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -326,6 +326,18 @@ Item {
 */
 
 /*!
+    \qmlproperty int QtQuick::MouseEvent::flags
+    \since 5.11
+
+    This property holds the flags that provide additional information about the
+    mouse event.
+
+    \value Qt.MouseEventCreatedDoubleClick Indicates that Qt has created a
+    double click event from this event. This flag is set in the event originating
+    from a button press, and not in the resulting double click event.
+*/
+
+/*!
     \qmltype WheelEvent
     \instantiates QQuickWheelEvent
     \inqmlmodule QtQuick
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index af5857cf63..0f7e44e0e2 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -131,15 +131,18 @@ class Q_QUICK_PRIVATE_EXPORT QQuickMouseEvent : public QObject
     Q_PROPERTY(bool wasHeld READ wasHeld)
     Q_PROPERTY(bool isClick READ isClick)
     Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
+    Q_REVISION(11) Q_PROPERTY(int flags READ flags)
 
 public:
     QQuickMouseEvent()
       : _x(0), _y(0), _button(Qt::NoButton), _buttons(Qt::NoButton), _modifiers(Qt::NoModifier)
       , _source(Qt::MouseEventNotSynthesized), _wasHeld(false), _isClick(false), _accepted(false)
+      , _flags(Qt::MouseEventFlags(0))
     {}
 
     void reset(qreal x, qreal y, Qt::MouseButton button, Qt::MouseButtons buttons,
-               Qt::KeyboardModifiers modifiers, bool isClick = false, bool wasHeld = false)
+               Qt::KeyboardModifiers modifiers, bool isClick = false, bool wasHeld = false,
+               Qt::MouseEventFlags flags = 0)
     {
         _x = x;
         _y = y;
@@ -150,6 +153,7 @@ public:
         _wasHeld = wasHeld;
         _isClick = isClick;
         _accepted = true;
+        _flags = flags;
     }
 
     qreal x() const { return _x; }
@@ -169,7 +173,7 @@ public:
 
     bool isAccepted() { return _accepted; }
     void setAccepted(bool accepted) { _accepted = accepted; }
-
+    int flags() const { return _flags; }
 private:
     qreal _x;
     qreal _y;
@@ -180,6 +184,7 @@ private:
     bool _wasHeld : 1;
     bool _isClick : 1;
     bool _accepted : 1;
+    Qt::MouseEventFlags _flags;
 };
 
 class QQuickWheelEvent : public QObject
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 96f34ef276..cea8293ceb 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -99,6 +99,7 @@ void QQuickMouseAreaPrivate::saveEvent(QMouseEvent *event)
     lastButton = event->button();
     lastButtons = event->buttons();
     lastModifiers = event->modifiers();
+    lastFlags = event->flags();
 }
 
 bool QQuickMouseAreaPrivate::isPressAndHoldConnected()
@@ -784,7 +785,7 @@ void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
 #endif
 
     QQuickMouseEvent &me = d->quickMouseEvent;
-    me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+    me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress, event->flags());
     me.setSource(event->source());
     emit mouseXChanged(&me);
     me.setPosition(d->lastPos);
@@ -827,7 +828,8 @@ void QQuickMouseArea::mouseDoubleClickEvent(QMouseEvent *event)
     if (d->enabled) {
         d->saveEvent(event);
         QQuickMouseEvent &me = d->quickMouseEvent;
-        me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
+        me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true,
+                 false, event->flags());
         me.setSource(event->source());
         me.setAccepted(d->isDoubleClickConnected());
         emit this->doubleClicked(&me);
@@ -1028,7 +1030,7 @@ void QQuickMouseArea::timerEvent(QTimerEvent *event)
         if (d->pressed && dragged == false && d->hovered == true) {
             d->longPress = true;
             QQuickMouseEvent &me = d->quickMouseEvent;
-            me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+            me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress, d->lastFlags);
             me.setSource(Qt::MouseEventSynthesizedByQt);
             me.setAccepted(d->isPressAndHoldConnected());
             emit pressAndHold(&me);
@@ -1207,7 +1209,7 @@ bool QQuickMouseArea::setPressed(Qt::MouseButton button, bool p, Qt::MouseEventS
 
     if (wasPressed != p) {
         QQuickMouseEvent &me = d->quickMouseEvent;
-        me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
+        me.reset(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress, d->lastFlags);
         me.setSource(source);
         if (p) {
             d->pressed |= button;
diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h
index 2fa5f7cd44..34cda9e193 100644
--- a/src/quick/items/qquickmousearea_p_p.h
+++ b/src/quick/items/qquickmousearea_p_p.h
@@ -112,6 +112,7 @@ public:
 #endif
     QQuickMouseEvent quickMouseEvent;
     QQuickWheelEvent quickWheelEvent;
+    Qt::MouseEventFlags lastFlags;
 };
 
 QT_END_NAMESPACE