aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-23 12:58:18 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-10-23 14:38:28 +0000
commit2fe4bbd0aef2efb825802ad21a93c43323e1bb87 (patch)
tree53d76c36d55d200162ea78c85edcd09a4c038c04
parent9ebb64735775974bb376a3f58ba9fd3bba72a968 (diff)
Fix compiler warning: mark overrides as such, remove virtual
Change-Id: I77bd88eb0f277c139fd296c1dafa8b09517a3064 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit c31c4068f87bb65328b4d25ca0c8d428ab8f74a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-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 e44302bd7e..42348d8dd1 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -74,15 +74,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();