diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-09-01 10:59:54 +0000 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-04 08:20:19 +0000 |
| commit | 8f93d3627a9b76bf77896501129990e33a77f32c (patch) | |
| tree | 9514c93c51c2bfe433ec2e04e3e6861bc8d91dcf /src/imports | |
| parent | 7c54910a660dfe8e8b9fa20a82a93fcda2eb198f (diff) | |
Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"
It seems this is causing QTBUG-62925 and QTBUG-62926 so revert
is the best option at this point to proceed
This reverts commit 4c46dce8fd9c9dddddd1d07f56396b3eabb2efc4.
Change-Id: Ia8ea85c1ac1ada1752b29c9fbd8439f5963d46d2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 9a279a3327..7ff51bb6d6 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1321,27 +1321,15 @@ Item { if (ddy < (util.dragThreshold + 1)) ddy = 0 - var originalX = item.x; - var originalY = item.y; - mousePress(item, x, y, button, modifiers, delay) - - // trigger dragging, this doesn't actually move the item yet - var triggerDragXPos = x + Math.min(util.dragThreshold + 1, dx); - var triggerDragYPos = y + Math.min(util.dragThreshold + 1, dy); - mouseMove(item, triggerDragXPos, triggerDragYPos, moveDelay, button) - + //trigger dragging + mouseMove(item, x + util.dragThreshold + 1, y + util.dragThreshold + 1, moveDelay, button) if (ddx > 0 || ddy > 0) { - // move the item by ddx, ddy - mouseMove(item, triggerDragXPos + ddx, triggerDragYPos + ddy, moveDelay, button) - - // move the item by ddx, ddy again - // need to account for whether the previous move actually moved the item or not - mouseMove(item, triggerDragXPos + 2*ddx - (item.x - originalX), triggerDragYPos + 2*ddy - (item.y - originalY), moveDelay, button) + mouseMove(item, x + ddx, y + ddy, moveDelay, button) + mouseMove(item, x + 2*ddx, y + 2*ddy, moveDelay, button) } - // Release, causes a final move - // need to account for whether the previous moves actually moved the item or not - mouseRelease(item, x + dx - (item.x - originalX), y + dy - (item.y - originalY), button, modifiers, delay) + mouseMove(item, x + dx, y + dy, moveDelay, button) + mouseRelease(item, x + dx, y + dy, button, modifiers, delay) } /*! |