diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/imports/testlib/TestCase.qml | |
parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to 'src/imports/testlib/TestCase.qml')
-rw-r--r-- | src/imports/testlib/TestCase.qml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index bc6786f9f8..683200a259 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1125,6 +1125,7 @@ Item { modifiers = Qt.NoModifier if (delay == undefined) delay = -1 + var moveDelay = Math.max(1, delay === -1 ? qtest_events.defaultMouseDelay : delay) // Divide dx and dy to have intermediate mouseMove while dragging // Fractions of dx/dy need be superior to the dragThreshold @@ -1138,12 +1139,12 @@ Item { mousePress(item, x, y, button, modifiers, delay) //trigger dragging - mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, delay, button) + mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, moveDelay, button) if (ddx > 0 || ddy > 0) { - mouseMove(item, x + ddx, y + ddy, delay, button) - mouseMove(item, x + 2*ddx, y + 2*ddy, delay, button) + mouseMove(item, x + ddx, y + ddy, moveDelay, button) + mouseMove(item, x + 2*ddx, y + 2*ddy, moveDelay, button) } - mouseMove(item, x + dx, y + dy, delay, button) + mouseMove(item, x + dx, y + dy, moveDelay, button) mouseRelease(item, x + dx, y + dy, button, modifiers, delay) } |