diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-01-31 16:11:24 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 07:09:45 +0100 |
| commit | 56d501290a7e62d0a97b7c43d755042aa5d1cb49 (patch) | |
| tree | 8fdaa6031d820ffabc1ceb0fe7da0bfb38fb9c4d | |
| parent | 001c842689ee5a0a91fff51a25fc6f7f9d523e51 (diff) | |
| download | qtlocation-56d501290a7e62d0a97b7c43d755042aa5d1cb49.tar.gz | |
Work around broken Map mouse tests.
Due to QTBUG-36560 some map mouse tests were failing. Implement a valid
workaround until it is fix.
Change-Id: Iec67f82d2e2a9792ed067b9cd956345ab38e7ab7
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_mouse.qml | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index 3931b1ca..189b7c7b 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -126,12 +126,13 @@ Item { property bool lastIsClick: false property bool lastAccepted: false; - onClicked: { page.setMouseData(mouseUpper, mouse); } - onDoubleClicked: { page.setMouseData(mouseUpper, mouse); } - onPressed: { page.setMouseData(mouseUpper, mouse); } - onReleased: { page.setMouseData(mouseUpper, mouse); } - onPositionChanged: { page.setMouseData(mouseUpper, mouse); } - onPressAndHold: { page.setMouseData(mouseUpper, mouse); } + // The following signal handlers use arguments[0] instead of mouse due to QTBUG-36560 + onClicked: page.setMouseData(mouseUpper, arguments[0]) + onDoubleClicked: page.setMouseData(mouseUpper, arguments[0]) + onPressed: page.setMouseData(mouseUpper, arguments[0]) + onReleased: page.setMouseData(mouseUpper, arguments[0]) + onPositionChanged: page.setMouseData(mouseUpper, arguments[0]) + onPressAndHold: page.setMouseData(mouseUpper, arguments[0]) } MouseArea { id: mouseLower @@ -145,12 +146,14 @@ Item { property bool lastWasHeld: false; property bool lastIsClick: false property bool lastAccepted: false; - onClicked: { page.setMouseData(mouseLower, mouse); } - onDoubleClicked: { page.setMouseData(mouseLower, mouse); } - onPressed: { page.setMouseData(mouseLower, mouse); } - onReleased: { page.setMouseData(mouseLower, mouse); } - onPositionChanged: { page.setMouseData(mouseLower, mouse); } - onPressAndHold: { page.setMouseData(mouseLower, mouse); } + + // The following signal handlers use arguments[0] instead of mouse due to QTBUG-36560 + onClicked: page.setMouseData(mouseLower, arguments[0]) + onDoubleClicked: page.setMouseData(mouseLower, arguments[0]) + onPressed: page.setMouseData(mouseLower, arguments[0]) + onReleased: page.setMouseData(mouseLower, arguments[0]) + onPositionChanged: page.setMouseData(mouseLower, arguments[0]) + onPressAndHold: page.setMouseData(mouseLower, arguments[0]) } MouseArea { id: mouseOverlapper @@ -164,12 +167,14 @@ Item { property bool lastWasHeld: false; property bool lastIsClick: false property bool lastAccepted: false; - onClicked: { page.setMouseData(mouseOverlapper, mouse); } - onDoubleClicked: { page.setMouseData(mouseOverlapper, mouse); } - onPressed: { page.setMouseData(mouseOverlapper, mouse); } - onReleased: { page.setMouseData(mouseOverlapper, mouse); } - onPositionChanged: { page.setMouseData(mouseOverlapper, mouse); } - onPressAndHold: { page.setMouseData(mouseOverlapper, mouse); } + + // The following signal handlers use arguments[0] instead of mouse due to QTBUG-36560 + onClicked: page.setMouseData(mouseOverlapper, arguments[0]) + onDoubleClicked: page.setMouseData(mouseOverlapper, arguments[0]) + onPressed: page.setMouseData(mouseOverlapper, arguments[0]) + onReleased: page.setMouseData(mouseOverlapper, arguments[0]) + onPositionChanged: page.setMouseData(mouseOverlapper, arguments[0]) + onPressAndHold: page.setMouseData(mouseOverlapper, arguments[0]) } } |