summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/other')
-rw-r--r--tests/auto/other/gestures/tst_gestures.cpp14
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp6
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 9abe9a77c0..c1d39d8b72 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -106,7 +106,7 @@ public:
QGestureRecognizer::Result recognize(QGesture *state, QObject*, QEvent *event)
{
if (event->type() == CustomEvent::EventType) {
- QGestureRecognizer::Result result = 0;
+ QGestureRecognizer::Result result;
if (CustomGestureRecognizer::ConsumeEvents)
result |= QGestureRecognizer::ConsumeEventHint;
CustomGesture *g = static_cast<CustomGesture*>(state);
@@ -2200,41 +2200,41 @@ void tst_Gestures::testReuseCanceledGestures()
targetPos = gv->viewport()->mapFromParent(targetPos);
// "Tap" starts on child widget
- QTest::mousePress(gv->viewport(), Qt::LeftButton, 0, targetPos);
+ QTest::mousePress(gv->viewport(), Qt::LeftButton, { }, targetPos);
QCOMPARE(target->started(), 1);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 0);
QCOMPARE(target->canceled(), 0);
// Canceling gesture starts on parent
- QTest::mousePress(gv->viewport(), Qt::RightButton, 0, targetPos);
+ QTest::mousePress(gv->viewport(), Qt::RightButton, { }, targetPos);
QCOMPARE(target->started(), 1);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 0);
QCOMPARE(target->canceled(), 1); // <- child canceled
// Canceling gesture ends
- QTest::mouseRelease(gv->viewport(), Qt::RightButton, 0, targetPos);
+ QTest::mouseRelease(gv->viewport(), Qt::RightButton, { }, targetPos);
QCOMPARE(target->started(), 1);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 0);
QCOMPARE(target->canceled(), 1);
// Tap would end if not canceled
- QTest::mouseRelease(gv->viewport(), Qt::LeftButton, 0, targetPos);
+ QTest::mouseRelease(gv->viewport(), Qt::LeftButton, { }, targetPos);
QCOMPARE(target->started(), 1);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 0);
QCOMPARE(target->canceled(), 1);
// New "Tap" starts
- QTest::mousePress(gv->viewport(), Qt::LeftButton, 0, targetPos);
+ QTest::mousePress(gv->viewport(), Qt::LeftButton, { }, targetPos);
QCOMPARE(target->started(), 2);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 0);
QCOMPARE(target->canceled(), 1);
- QTest::mouseRelease(gv->viewport(), Qt::LeftButton, 0, targetPos);
+ QTest::mouseRelease(gv->viewport(), Qt::LeftButton, { }, targetPos);
QCOMPARE(target->started(), 2);
QCOMPARE(target->updated(), 0);
QCOMPARE(target->finished(), 1);
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 7d7fa6403b..95a8230fe3 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -310,7 +310,7 @@ void tst_QAccessibility::eventTest()
QVERIFY(QTestAccessibility::containsEvent(&showEvent));
button->setFocus(Qt::MouseFocusReason);
QTestAccessibility::clearEvents();
- QTest::mouseClick(button, Qt::LeftButton, 0);
+ QTest::mouseClick(button, Qt::LeftButton, { });
button->setAccessibleName("Olaf the second");
QAccessibleEvent nameEvent(button, QAccessible::NameChanged);
@@ -2829,14 +2829,14 @@ void tst_QAccessibility::listTest()
QTestAccessibility::clearEvents();
// Check for events
- QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(1)).center());
+ QTest::mouseClick(listView->viewport(), Qt::LeftButton, { }, listView->visualItemRect(listView->item(1)).center());
QAccessibleEvent selectionEvent(listView, QAccessible::SelectionAdd);
selectionEvent.setChild(1);
QAccessibleEvent focusEvent(listView, QAccessible::Focus);
focusEvent.setChild(1);
QVERIFY(QTestAccessibility::containsEvent(&selectionEvent));
QVERIFY(QTestAccessibility::containsEvent(&focusEvent));
- QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(2)).center());
+ QTest::mouseClick(listView->viewport(), Qt::LeftButton, { }, listView->visualItemRect(listView->item(2)).center());
QAccessibleEvent selectionEvent2(listView, QAccessible::SelectionAdd);
selectionEvent2.setChild(2);