diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-05 15:31:08 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 10:11:04 +0200 |
| commit | af44559780765c7121a49c2e0764cf24e740312d (patch) | |
| tree | a4f2f50ddfe969f33a4d4accd392523c6809fd5a /tests/auto/quick/qquickpathview | |
| parent | 8784a4a46ea1357bde546c9a1c88bd060e863f30 (diff) | |
| parent | b30d7c9ee8fbc3a395c74b618f2ab176ae1e7f7e (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
Diffstat (limited to 'tests/auto/quick/qquickpathview')
| -rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index e4ad7b9c40..083497750d 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1444,6 +1444,7 @@ void tst_QQuickPathView::undefinedPath() void tst_QQuickPathView::mouseDrag() { QScopedPointer<QQuickView> window(createView()); + QQuickViewTestUtil::moveMouseAway(window.data()); window->setSource(testFileUrl("dragpath.qml")); window->show(); window->requestActivate(); @@ -1737,6 +1738,7 @@ void tst_QQuickPathView::cancelDrag() { QScopedPointer<QQuickView> window(createView()); window->setSource(testFileUrl("dragpath.qml")); + QQuickViewTestUtil::moveMouseAway(window.data()); window->show(); window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window.data())); @@ -1782,6 +1784,7 @@ void tst_QQuickPathView::maximumFlickVelocity() { QScopedPointer<QQuickView> window(createView()); window->setSource(testFileUrl("dragpath.qml")); + QQuickViewTestUtil::moveMouseAway(window.data()); window->show(); window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window.data())); @@ -1827,6 +1830,7 @@ void tst_QQuickPathView::snapToItem() QFETCH(bool, enforceRange); QScopedPointer<QQuickView> window(createView()); + QQuickViewTestUtil::moveMouseAway(window.data()); window->setSource(testFileUrl("panels.qml")); QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view"); QVERIFY(pathview != 0); @@ -1865,6 +1869,7 @@ void tst_QQuickPathView::snapOneItem() QFETCH(bool, enforceRange); QScopedPointer<QQuickView> window(createView()); + QQuickViewTestUtil::moveMouseAway(window.data()); window->setSource(testFileUrl("panels.qml")); window->show(); window->requestActivate(); |