From 2ed9dc9cbb6fbf3a68780b48a456ce3ef9bf82c0 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 25 Jan 2016 15:14:27 +0100 Subject: AbstractButton: remove the mouse params from signals If we ever want to expose these, the name would be something else than "mouse"... :) Change-Id: Ie9dad16e84708059fd0b43d4764925db7b014d64 Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_button.qml | 76 --------------------------------- tests/auto/menu/tst_menu.cpp | 2 +- 2 files changed, 1 insertion(+), 77 deletions(-) (limited to 'tests') diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 1faf1956..45fad8cb 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -163,86 +163,10 @@ TestCase { control.destroy() } - Component { - id: eventButton - Button { - property var lastPress - property var lastRelease - property var lastClick - property var lastDoubleClick - - function reset() { - lastPress = undefined - lastRelease = undefined - lastClick = undefined - lastDoubleClick = undefined - } - - onPressed: { lastPress = { x: mouse.x, y: mouse.y, button: mouse.button, buttons: mouse.buttons, modifiers: mouse.modifiers, wasHeld: mouse.wasHeld, isClick: mouse.isClick } } - onReleased: { lastRelease = { x: mouse.x, y: mouse.y, button: mouse.button, buttons: mouse.buttons, modifiers: mouse.modifiers, wasHeld: mouse.wasHeld, isClick: mouse.isClick } } - onClicked: { lastClick = { x: mouse.x, y: mouse.y, button: mouse.button, buttons: mouse.buttons, modifiers: mouse.modifiers, wasHeld: mouse.wasHeld, isClick: mouse.isClick } } - onDoubleClicked: { lastDoubleClick = { x: mouse.x, y: mouse.y, button: mouse.button, buttons: mouse.buttons, modifiers: mouse.modifiers, wasHeld: mouse.wasHeld, isClick: mouse.isClick } } - } - } - function eventErrorMessage(actual, expected) { return "actual event:" + JSON.stringify(actual) + ", expected event:" + JSON.stringify(expected) } - function test_events() { - var control = eventButton.createObject(testCase) - verify(control) - - control.forceActiveFocus() - verify(control.activeFocus) - - mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton) - var expected = { x: Math.round(control.width / 2), y: Math.round(control.height / 2), button: Qt.LeftButton, buttons: Qt.LeftButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: false } - compare(control.lastPress, expected, eventErrorMessage(control.lastPress, expected)) - compare(control.lastRelease, undefined) - compare(control.lastClick, undefined) - compare(control.lastDoubleClick, undefined) - - control.reset() - - mouseMove(control, control.width / 3, control.height / 3, Qt.LeftButton) - compare(control.lastPress, undefined) - compare(control.lastRelease, undefined) - compare(control.lastClick, undefined) - compare(control.lastDoubleClick, undefined) - - control.reset() - - mouseRelease(control, control.width / 4, control.height / 4, Qt.LeftButton) - compare(control.lastPress, undefined) - expected = { x: Math.round(control.width / 4), y: Math.round(control.height / 4), button: Qt.LeftButton, buttons: Qt.NoButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: false } - compare(control.lastRelease, expected, eventErrorMessage(control.lastRelease, expected)) - expected = { x: Math.round(control.width / 4), y: Math.round(control.height / 4), button: Qt.LeftButton, buttons: Qt.NoButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: true } - compare(control.lastClick, expected, eventErrorMessage(control.lastClick, expected)) - compare(control.lastDoubleClick, undefined) - - control.reset() - - keyPress(Qt.Key_Space) - expected = { x: Math.round(control.width / 2), y: Math.round(control.height / 2), button: Qt.NoButton, buttons: Qt.NoButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: false } - compare(control.lastPress, expected, eventErrorMessage(control.lastPress, expected)) - compare(control.lastRelease, undefined) - compare(control.lastClick, undefined) - compare(control.lastDoubleClick, undefined) - - control.reset() - - keyRelease(Qt.Key_Space) - compare(control.lastPress, undefined) - expected = { x: Math.round(control.width / 2), y: Math.round(control.height / 2), button: Qt.NoButton, buttons: Qt.NoButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: false } - compare(control.lastRelease, expected, eventErrorMessage(control.lastRelease, expected)) - expected = { x: Math.round(control.width / 2), y: Math.round(control.height / 2), button: Qt.NoButton, buttons: Qt.NoButton, modifiers: Qt.NoModifier, wasHeld: false, isClick: true } - compare(control.lastClick, expected, eventErrorMessage(control.lastClick, expected)) - compare(control.lastDoubleClick, undefined) - - control.destroy() - } - SignalSpy { id: clickSpy; signalName: "clicked" } function test_autoRepeat() { diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp index d072af4b..825867cf 100644 --- a/tests/auto/menu/tst_menu.cpp +++ b/tests/auto/menu/tst_menu.cpp @@ -89,7 +89,7 @@ void tst_menu::mouse() QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); QQuickItem *firstItem = menu->itemAt(0); - QSignalSpy clickedSpy(firstItem, SIGNAL(clicked(QQuickMouseEvent*))); + QSignalSpy clickedSpy(firstItem, SIGNAL(clicked())); QSignalSpy triggeredSpy(firstItem, SIGNAL(triggered())); QSignalSpy visibleSpy(menu, SIGNAL(visibleChanged())); -- cgit v1.2.3