QTestLib: Move lastButton member into implementation

Keeping a static variable in an inline function is a bad idea because
each definition of that function will have its own version of the
variable. As qtestmouse.h can be included multiple times in the same
test (via some utility classes as with tst_qquickflickable), this
leads to confusion.

Change-Id: I80f198817c34c3a7e07bf6944189927817efb8a6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 5f69463867..fa6bb29d3a 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -64,6 +64,9 @@ namespace QTest
 {
     enum MouseAction { MousePress, MouseRelease, MouseClick, MouseDClick, MouseMove };
 
+    extern Q_TESTLIB_EXPORT Qt::MouseButton lastMouseButton;
+    extern Q_TESTLIB_EXPORT int lastMouseTimestamp;
+
     static void waitForEvents()
     {
 #ifdef Q_OS_MAC
@@ -84,9 +87,6 @@ namespace QTest
             QTest::qWarn("Mouse event occurs outside of target window.");
         }
 
-        static Qt::MouseButton lastButton = Qt::NoButton;
-        static int timestamp = 0;
-
         if (delay == -1 || delay < defaultMouseDelay())
             delay = defaultMouseDelay();
         if (delay > 0)
@@ -105,23 +105,23 @@ namespace QTest
         switch (action)
         {
         case MouseDClick:
-            qt_handleMouseEvent(w, pos, global, button, stateKey, timestamp);
-            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++timestamp);
+            qt_handleMouseEvent(w, pos, global, button, stateKey, lastMouseTimestamp);
+            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++lastMouseTimestamp);
             // fall through
         case MousePress:
         case MouseClick:
-            qt_handleMouseEvent(w, pos, global, button, stateKey, ++timestamp);
-            lastButton = button;
+            qt_handleMouseEvent(w, pos, global, button, stateKey, ++lastMouseTimestamp);
+            lastMouseButton = button;
             if (action == MousePress)
                 break;
             // fall through
         case MouseRelease:
-            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++timestamp);
-            timestamp += 500; // avoid double clicks being generated
-            lastButton = Qt::NoButton;
+            qt_handleMouseEvent(w, pos, global, Qt::NoButton, stateKey, ++lastMouseTimestamp);
+            lastMouseTimestamp += 500; // avoid double clicks being generated
+            lastMouseButton = Qt::NoButton;
             break;
         case MouseMove:
-            qt_handleMouseEvent(w, pos, global, lastButton, stateKey, ++timestamp);
+            qt_handleMouseEvent(w, pos, global, lastMouseButton, stateKey, ++lastMouseTimestamp);
             // No QCursor::setPos() call here. That could potentially result in mouse events sent by the windowing system
             // which is highly undesired here. Tests must avoid relying on QCursor.
             break;