From 9c0ea2c3e77ee2c101a7d3351455f87cda0d8f21 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Mon, 14 May 2012 14:43:24 +1000 Subject: Ensure scale property is initialized Also, do not fail flickable test if a flick is initiated. Change-Id: I2701bfa174dd42b462d21a8d39211ab85fa1f282 Reviewed-by: Martin Jones --- tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml | 2 +- .../declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml b/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml index 0b59d9dc..bc0677e8 100644 --- a/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml +++ b/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml @@ -2,7 +2,7 @@ import QtQuick 1.1 Rectangle { id: whiteRect property variant center - property real scale + property real scale: 1.0 width: 240; height: 320 color: "white" Rectangle { diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index 674d7404..df22648f 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -376,7 +376,7 @@ void tst_QDeclarativePinchArea::flickable() QTest::touchEvent(vp, device).move(0, p1, canvas).move(1, p2, canvas); // PinchArea has stolen the gesture. - QVERIFY(!root->isMoving()); + QTRY_VERIFY(!root->isMoving()); QVERIFY(root->property("scale").toReal() > 1.0); QTest::mouseRelease(vp, Qt::LeftButton, 0, canvas->mapFromScene(p1)); -- cgit v1.2.3