summaryrefslogtreecommitdiffstats
path: root/tests/auto/other/gestures
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-11-18 17:01:26 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-11-20 19:43:38 +0100
commitaf2daafde72db02454d24b7d691aa6861525ab99 (patch)
treeb59c47baf8af94a6ace5cbf4338944272e40e32b /tests/auto/other/gestures
parent8bc4ea1e97c138034d08c705a75f75763361400b (diff)
Deprecate constructing QFlags from a pointer
This was used to support QFlags f = 0 initialization, but with 0 used as a pointer literal now considered bad form, it had been changed many places to QFlags f = nullptr, which is meaningless and confusing. Change-Id: I4bc592151c255dc5cab1a232615caecc520f02e8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/other/gestures')
-rw-r--r--tests/auto/other/gestures/tst_gestures.cpp14
1 files changed, 7 insertions, 7 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);