3 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index f788d5ee..7e892025 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -91,6 +91,7 @@ void tst_menu::mouse()
     QQuickApplicationWindow *window = helper.appWindow;
     window->show();
     QVERIFY(QTest::qWaitForWindowActive(window));
+    moveMouseAway(window);
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
     menu->open();
@@ -180,6 +181,7 @@ void tst_menu::contextMenuKeyboard()
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(QGuiApplication::focusWindow() == window);
+    moveMouseAway(window);
 
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
     QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
@@ -439,6 +441,7 @@ void tst_menu::popup()
     QVERIFY(menuItem3);
 
 #if QT_CONFIG(cursor)
+    QPoint oldCursorPos = QCursor::pos();
     QPoint cursorPos = window->mapToGlobal(QPoint(11, 22));
     QCursor::setPos(cursorPos);
     QTRY_COMPARE(QCursor::pos(), cursorPos);
@@ -485,6 +488,9 @@ void tst_menu::popup()
         QTRY_COMPARE(menu->property("y").toInt(), window->height() / 3 * 2 + menu->topPadding() - menuItem->y());
         menu->close();
     }
+
+    QCursor::setPos(oldCursorPos);
+    QTRY_COMPARE(QCursor::pos(), oldCursorPos);
 #endif
 }
 
diff --git a/tests/auto/shared/visualtestutil.cpp b/tests/auto/shared/visualtestutil.cpp
index 60b8790d..5e44f5e7 100644
--- a/tests/auto/shared/visualtestutil.cpp
+++ b/tests/auto/shared/visualtestutil.cpp
@@ -38,6 +38,7 @@
 
 #include <QtQuick/QQuickItem>
 #include <QtCore/QDebug>
+#include <QtGui/QCursor>
 
 bool QQuickVisualTestUtil::delegateVisible(QQuickItem *item)
 {
@@ -69,3 +70,11 @@ void QQuickVisualTestUtil::dumpTree(QQuickItem *parent, int depth)
     }
 }
 
+void QQuickVisualTestUtil::moveMouseAway(QQuickWindow *window)
+{
+#if QT_CONFIG(cursor) // Get the cursor out of the way.
+    QCursor::setPos(window->geometry().topRight() + QPoint(100, 100));
+#else
+    Q_UNUSED(window)
+#endif
+}
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index 12f955ea..bcf45660 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -54,6 +54,8 @@ namespace QQuickVisualTestUtil
 
     bool delegateVisible(QQuickItem *item);
 
+    void moveMouseAway(QQuickWindow *window);
+
     /*
        Find an item with the specified objectName.  If index is supplied then the
        item must also evaluate the {index} expression equal to index