diff options
Diffstat (limited to 'tests')
| -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]) } } |