diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-11-16 18:46:03 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-11-17 10:56:25 +0100 |
commit | 3d9ece8e578e0f6abcff1484669444355ad218c6 (patch) | |
tree | c9e0666cd534c2908a21a7099eefcab2bc1e4d37 /tests/auto/quick/pointerhandlers/qquickpinchhandler/data | |
parent | 2ebb401de8f08489a1b361e33880f43c9483c27e (diff) |
tst_qquickpinchhandler: rename root.scale property to pinchScale
It doesn't look sensible to hide the existing Item.scale property.
PinchArea's properties are directly accessible in test code, but maybe
there's some sense in testing the onActiveChanged and onUpdated signals.
Amends f289141524d9331bdafd9f88d95e0fa9b29ccdee which copied code from
tst_qquickpincharea.
Pick-to: 6.2 6.4
Change-Id: I108fffc9b99b4eebc949fe11c9b7dd649d98f59a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/quick/pointerhandlers/qquickpinchhandler/data')
-rw-r--r-- | tests/auto/quick/pointerhandlers/qquickpinchhandler/data/pinchproperties.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/data/pinchproperties.qml b/tests/auto/quick/pointerhandlers/qquickpinchhandler/data/pinchproperties.qml index 689259b134..1cb80e32e6 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/data/pinchproperties.qml +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/data/pinchproperties.qml @@ -5,7 +5,7 @@ import QtQuick 2.12 Rectangle { id: whiteRect - property real scale: -1.0 + property real pinchScale: -1.0 property int activeCount : 0 property int deactiveCount : 0 width: 320; height: 320 @@ -38,13 +38,13 @@ Rectangle { xAxis.maximum: 140 yAxis.maximum: 170 onActiveChanged: { - whiteRect.scale = pincharea.scale + whiteRect.pinchScale = pincharea.scale if (active) ++activeCount else ++deactiveCount; } onUpdated: { - whiteRect.scale = pincharea.scale + whiteRect.pinchScale = pincharea.scale //whiteRect.pointCount = pincharea.pointCount } } |