diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-02-16 18:34:24 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 02:53:43 +0100 |
| commit | e8ca72d484c0e56f030e4742bb5f92b6f0555146 (patch) | |
| tree | 2b7c5a623af743d85fadd46855d9da9b0331320b /tests/auto/declarative/qdeclarativemousearea | |
| parent | 67db779665b1d95a20720c0dee058c47f7df8726 (diff) | |
Flickable shouldn't grab the mouse until it starts an effective move.
If the boundBehavior prevents the flickable from moving its content
item in response to a drag it shouldn't grab the mouse as that will
prevent a parent MouseArea or Flickable from handling the drag.
Task-number: 29718
Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativemousearea')
| -rw-r--r-- | tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 855ad602..37e64d4d 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -597,8 +597,8 @@ void tst_QDeclarativeMouseArea::preventStealing() QVERIFY(!mouseArea->pressed()); // Flickable content should have moved. - QCOMPARE(flickable->contentX(), 15.); - QCOMPARE(flickable->contentY(), 15.); + QCOMPARE(flickable->contentX(), 30.); + QCOMPARE(flickable->contentY(), 30.); QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 50))); |