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/qquickgridview | |
| 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/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index d0ffba9435..f1adb7858f 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -4253,6 +4253,7 @@ void tst_QQuickGridView::snapToRow() QQuickView *window = getView(); + QQuickViewTestUtil::moveMouseAway(window); window->setSource(testFileUrl("snapToRow.qml")); window->show(); qApp->processEvents(); @@ -4347,6 +4348,7 @@ void tst_QQuickGridView::snapOneRow() QFETCH(qreal, startExtent); QQuickView *window = getView(); + QQuickViewTestUtil::moveMouseAway(window); window->setSource(testFileUrl("snapOneRow.qml")); window->show(); |