aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickitem
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-23 12:58:18 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-23 12:11:55 +0000
commitc31c4068f87bb65328b4d25ca0c8d428ab8f74a6 (patch)
tree83f99e4dceddec2ebb943e9aff8ddc6d58f7e012 /tests/auto/quick/qquickitem
parent797a8f2aaaa8133ea8a54d9e4b91ba531fab3070 (diff)
Fix compiler warning: mark overrides as such, remove virtual
Pick-to: 5.15 Change-Id: I77bd88eb0f277c139fd296c1dafa8b09517a3064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickitem')
-rw-r--r--tests/auto/quick/qquickitem/tst_qquickitem.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index f8986ce66b..5d4cd8bcae 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -78,15 +78,15 @@ public:
QPoint lastWheelEventGlobalPos;
int languageChangeEventCount = 0;
protected:
- virtual void focusInEvent(QFocusEvent *) { Q_ASSERT(!focused); focused = true; }
- virtual void focusOutEvent(QFocusEvent *) { Q_ASSERT(focused); focused = false; }
- virtual void mousePressEvent(QMouseEvent *event) { event->accept(); ++pressCount; }
- virtual void mouseReleaseEvent(QMouseEvent *event) { event->accept(); ++releaseCount; }
- virtual void touchEvent(QTouchEvent *event) {
+ void focusInEvent(QFocusEvent *) override { Q_ASSERT(!focused); focused = true; }
+ void focusOutEvent(QFocusEvent *) override { Q_ASSERT(focused); focused = false; }
+ void mousePressEvent(QMouseEvent *event) override { event->accept(); ++pressCount; }
+ void mouseReleaseEvent(QMouseEvent *event) override { event->accept(); ++releaseCount; }
+ void touchEvent(QTouchEvent *event) override {
touchEventReached = true;
event->setAccepted(acceptIncomingTouchEvents);
}
- virtual void wheelEvent(QWheelEvent *event) {
+ void wheelEvent(QWheelEvent *event) override {
event->accept();
++wheelCount;
timestamp = event->timestamp();