Merge remote-tracking branch 5.15 into dev

Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7

1 files changed, 69 insertions, 4 deletions

diff --git a/tests/auto/input/mousedevice/tst_mousedevice.cpp b/tests/auto/input/mousedevice/tst_mousedevice.cpp
index 41ecd68c7..cad1ab951 100644
--- a/tests/auto/input/mousedevice/tst_mousedevice.cpp
+++ b/tests/auto/input/mousedevice/tst_mousedevice.cpp
@@ -58,6 +58,7 @@ private Q_SLOTS:
         QCOMPARE(backendMouseDevice.previousPos(), QPointF());
         QCOMPARE(backendMouseDevice.wasPressed(), false);
         QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
     }
 
     void checkInitializeFromPeer()
@@ -85,6 +86,7 @@ private Q_SLOTS:
             QCOMPARE(backendMouseDevice.previousPos(), QPointF());
             QCOMPARE(backendMouseDevice.wasPressed(), false);
             QCOMPARE(backendMouseDevice.sensitivity(), 0.8f);
+            QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
         }
         {
             // WHEN
@@ -125,6 +127,7 @@ private Q_SLOTS:
         QCOMPARE(backendMouseDevice.previousPos(), QPointF(400.0f, 400.0f));
         QCOMPARE(backendMouseDevice.wasPressed(), true);
         QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
 
         // WHEN
         eventList = QList<QT_PREPEND_NAMESPACE(QMouseEvent)>() << QT_PREPEND_NAMESPACE(QMouseEvent)(QMouseEvent::MouseMove,
@@ -147,12 +150,13 @@ private Q_SLOTS:
         QCOMPARE(backendMouseDevice.previousPos(), QPointF(600.0f, 600.0f));
         QCOMPARE(backendMouseDevice.wasPressed(), true);
         QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
 
         // WHEN
         eventList = QList<QT_PREPEND_NAMESPACE(QMouseEvent)>() << QT_PREPEND_NAMESPACE(QMouseEvent)(QMouseEvent::MouseButtonRelease,
-                                                                                                    QPointF(600.0f, 600.0f),
-                                                                                                    QPointF(600.0f, 600.0f),
-                                                                                                    QPointF(600.0f, 600.0f),
+                                                                                                    QPointF(800.0f, 800.0f),
+                                                                                                    QPointF(800.0f, 800.0f),
+                                                                                                    QPointF(800.0f, 800.0f),
                                                                                                     Qt::LeftButton,
                                                                                                     Qt::NoButton,
                                                                                                     Qt::NoModifier);
@@ -166,9 +170,61 @@ private Q_SLOTS:
         QCOMPARE(backendMouseDevice.mouseState().leftPressed, false);
         QCOMPARE(backendMouseDevice.mouseState().rightPressed, false);
         QCOMPARE(backendMouseDevice.mouseState().centerPressed, false);
-        QCOMPARE(backendMouseDevice.previousPos(), QPointF(600.0f, 600.0f));
+        QCOMPARE(backendMouseDevice.previousPos(), QPointF(800.0f, 800.0f));
         QCOMPARE(backendMouseDevice.wasPressed(), false);
         QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
+
+        // WHEN
+        eventList = QList<QT_PREPEND_NAMESPACE(QMouseEvent)>() << QT_PREPEND_NAMESPACE(QMouseEvent)(QMouseEvent::MouseMove,
+                                                                                                    QPointF(900.0f, 900.0f),
+                                                                                                    QPointF(900.0f, 900.0f),
+                                                                                                    QPointF(900.0f, 900.0f),
+                                                                                                    Qt::NoButton,
+                                                                                                    Qt::NoButton,
+                                                                                                    Qt::NoModifier);
+
+        // THEN -> no axes update
+        backendMouseDevice.updateMouseEvents(eventList);
+        QCOMPARE(backendMouseDevice.mouseState().xAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().yAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().wXAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().wYAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().leftPressed, false);
+        QCOMPARE(backendMouseDevice.mouseState().rightPressed, false);
+        QCOMPARE(backendMouseDevice.mouseState().centerPressed, false);
+        QCOMPARE(backendMouseDevice.previousPos(), QPointF(900.0f, 900.0f));
+        QCOMPARE(backendMouseDevice.wasPressed(), false);
+        QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), false);
+
+
+        // WHEN
+        eventList = QList<QT_PREPEND_NAMESPACE(QMouseEvent)>() << QT_PREPEND_NAMESPACE(QMouseEvent)(QMouseEvent::MouseMove,
+                                                                                                    QPointF(1000.0f, 1000.0f),
+                                                                                                    QPointF(1000.0f, 1000.0f),
+                                                                                                    QPointF(1000.0f, 1000.0f),
+                                                                                                    Qt::NoButton,
+                                                                                                    Qt::NoButton,
+                                                                                                    Qt::NoModifier);
+
+        Qt3DInput::QMouseDevice mouseDevice;
+        mouseDevice.setUpdateAxesContinuously(true);
+        backendMouseDevice.syncFromFrontEnd(&mouseDevice, false);
+        backendMouseDevice.updateMouseEvents(eventList);
+
+        // THEN
+        QCOMPARE(backendMouseDevice.mouseState().xAxis, (1000.0f - 900.0f) * 0.1f);
+        QCOMPARE(backendMouseDevice.mouseState().yAxis, (900.0f - 1000.0f) * 0.1f);
+        QCOMPARE(backendMouseDevice.mouseState().wXAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().wYAxis, 0.0f);
+        QCOMPARE(backendMouseDevice.mouseState().leftPressed,false);
+        QCOMPARE(backendMouseDevice.mouseState().rightPressed, false);
+        QCOMPARE(backendMouseDevice.mouseState().centerPressed, false);
+        QCOMPARE(backendMouseDevice.previousPos(), QPointF(1000.0f, 1000.0f));
+        QCOMPARE(backendMouseDevice.wasPressed(), false);
+        QCOMPARE(backendMouseDevice.sensitivity(), 0.1f);
+        QCOMPARE(backendMouseDevice.updateAxesContinuously(), true);
     }
 
     void checkMouseWheelState()
@@ -249,6 +305,15 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(backendMouseDevice.sensitivity(), newValue);
         }
+        {
+            // WHEN
+            const bool newValue = true;
+            mouseDevice.setUpdateAxesContinuously(newValue);
+            backendMouseDevice.syncFromFrontEnd(&mouseDevice, false);
+
+            // THEN
+            QCOMPARE(backendMouseDevice.updateAxesContinuously(), newValue);
+        }
     }
 
 };