diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:07 +0100 |
| commit | 692ff260851575171be6751a7bdf34a744c2ed9d (patch) | |
| tree | 67c2ee80fb6a477f731ebc1898a5dfd43c878d2d /tests/manual/pointer | |
| parent | 8740f35e69dad301eeaa2fc4b74ecab661cdc0c4 (diff) | |
| parent | 5cb76fb3704947cfc4d575695b137460ecc8bbd9 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1ed923d72566af663555898c3ec708191eef8ae9
Diffstat (limited to 'tests/manual/pointer')
| -rw-r--r-- | tests/manual/pointer/pinchDragFlingMPTA.qml | 2 | ||||
| -rw-r--r-- | tests/manual/pointer/pinchHandler.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/pointer/pinchDragFlingMPTA.qml b/tests/manual/pointer/pinchDragFlingMPTA.qml index 6446a17873..07b2dc2c45 100644 --- a/tests/manual/pointer/pinchDragFlingMPTA.qml +++ b/tests/manual/pointer/pinchDragFlingMPTA.qml @@ -75,7 +75,7 @@ Rectangle { id: pinch3 objectName: "3-finger pinch" target: container - requiredPointCount: 3 + minimumPointCount: 3 minimumScale: 0.1 maximumScale: 10 onActiveChanged: if (!active) fling.restart(centroidVelocity) diff --git a/tests/manual/pointer/pinchHandler.qml b/tests/manual/pointer/pinchHandler.qml index 71cdd98e4f..1102f33618 100644 --- a/tests/manual/pointer/pinchHandler.qml +++ b/tests/manual/pointer/pinchHandler.qml @@ -118,7 +118,7 @@ Rectangle { PinchHandler { id: pinch3 objectName: "3-finger pinch" - requiredPointCount: 3 + minimumPointCount: 3 minimumScale: 0.1 maximumScale: 10 onActiveChanged: { |