diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 12:32:08 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 12:32:39 +0100 |
commit | f2f20462e146508868d488f9bc370c53e000d2d9 (patch) | |
tree | 52022ca4c648807543ae2b8f48421b2e5a6df7d6 /tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml | |
parent | b4f8480fd41a806abe04e8eb2a4c416b2eff53c6 (diff) | |
parent | ecfb3ba8a7eb116c838a1acd5b82ca59ce76b082 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ib2a1eb4dfae2fb5a98066d3d0f8f09f4e1d61d3f
Diffstat (limited to 'tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml index 87ef16aa2..906dc1658 100644 --- a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml +++ b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml @@ -68,12 +68,10 @@ Item { keyPress(Qt.Key_Left) keyRelease(Qt.Key_Left) - for (var i = 0; i < 20 && parentItem.releaseEvents.length < 3; i++) - wait(100) - - compare(parentItem.pressEvents.length, 1) + tryCompare(parentItem.pressEvents, "length", 1) compare(parentItem.pressEvents[0], Qt.Key_Left) - compare(parentItem.releaseEvents.length, 3) + + tryCompare(parentItem.releaseEvents, "length", 3) compare(parentItem.releaseEvents[0], Qt.Key_A) compare(parentItem.releaseEvents[1], Qt.Key_Left) compare(parentItem.releaseEvents[2], Qt.Key_Left) |