aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-10-07 20:43:40 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2020-10-07 22:32:44 +0200
commitb0652fe3d7a77d38ac2bd427fba6e542d363eec6 (patch)
tree6bf4112c2d9ae65d413368d084ce53165cba63a1
parentb7cd68be0a71774f97b4403049e2e1a9d15ba29e (diff)
Fix tst_events benchmark
Converting from 0 to Qt::NoModifier was never a great idea. Change-Id: I694126c86e961a9af3f963fc830dbb65d535a61a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--tests/benchmarks/quick/events/tst_events.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/benchmarks/quick/events/tst_events.cpp b/tests/benchmarks/quick/events/tst_events.cpp
index 344842153b..438e9bf666 100644
--- a/tests/benchmarks/quick/events/tst_events.cpp
+++ b/tests/benchmarks/quick/events/tst_events.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@@ -70,10 +70,10 @@ void tst_events::mousePressRelease()
QCOMPARE(mouseArea->pressed(), false);
QBENCHMARK {
- QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+ QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&pressEvent);
QCOMPARE(mouseArea->pressed(), true);
- QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+ QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&releaseEvent);
}
QCOMPARE(mouseArea->pressed(), false);
@@ -84,17 +84,17 @@ void tst_events::mouseMove()
QQuickMouseArea *mouseArea = window.rootObject()->findChild<QQuickMouseArea *>("mouseArea");
QCOMPARE(mouseArea->pressed(), false);
- QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+ QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&pressEvent);
QCOMPARE(mouseArea->pressed(), true);
- QMouseEvent moveEvent1(QEvent::MouseMove, QPoint(101, 100), Qt::LeftButton, Qt::LeftButton, 0);
- QMouseEvent moveEvent2(QEvent::MouseMove, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+ QMouseEvent moveEvent1(QEvent::MouseMove, QPoint(101, 100), Qt::LeftButton, Qt::LeftButton, {});
+ QMouseEvent moveEvent2(QEvent::MouseMove, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {});
QBENCHMARK {
window.handleEvent(&moveEvent1);
window.handleEvent(&moveEvent2);
}
QCOMPARE(mouseArea->pressed(), true);
- QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
+ QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, {});
window.handleEvent(&releaseEvent);
QCOMPARE(mouseArea->pressed(), false);
}