diff options
73 files changed, 91 insertions, 91 deletions
diff --git a/tests/auto/particles/qquickage/tst_qquickage.cpp b/tests/auto/particles/qquickage/tst_qquickage.cpp index a233b30043..3a2d4e3927 100644 --- a/tests/auto/particles/qquickage/tst_qquickage.cpp +++ b/tests/auto/particles/qquickage/tst_qquickage.cpp @@ -40,7 +40,7 @@ public: tst_qquickage() {} private slots: - void initTestCase(); + void initTestCase() override; void test_kill(); void test_jump(); diff --git a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp index b3fc01caa6..6186dc97de 100644 --- a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp +++ b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp @@ -41,7 +41,7 @@ public: tst_qquickangleddirection() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp index 360b222367..c5c4bbb897 100644 --- a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp +++ b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp @@ -40,7 +40,7 @@ public: tst_qquickcumulativedirection() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp index b213f54007..213768bbb6 100644 --- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp +++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp @@ -40,7 +40,7 @@ public: tst_qquickcustomaffector() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); void test_move(); void test_affectedSignal(); diff --git a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp index a1fe5b225d..ec1659d486 100644 --- a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp +++ b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp @@ -41,7 +41,7 @@ public: tst_qquickellipseextruder() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); private: bool inCircle(qreal x, qreal y, qreal r, bool borderOnly=false); diff --git a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp index ab682c591e..de535118f4 100644 --- a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp +++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp @@ -40,7 +40,7 @@ public: tst_qquickfriction() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); void test_threshold(); }; diff --git a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp index 34566b90eb..dcc0c017e8 100644 --- a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp +++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp @@ -40,7 +40,7 @@ public: tst_qquickgravity() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp index 1228b4cc68..6ede0eb968 100644 --- a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp +++ b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp @@ -40,7 +40,7 @@ public: tst_qquickgroupgoal() {} private slots: - void initTestCase(); + void initTestCase() override; void test_instantTransition(); }; diff --git a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp index 736c188991..32a8a9435c 100644 --- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp +++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp @@ -43,7 +43,7 @@ public: ~tst_qquickimageparticle(); private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); void test_colored(); void test_colorVariance(); diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp index 538c429d1a..32fe1a63c4 100644 --- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp +++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp @@ -42,7 +42,7 @@ public: tst_qquickitemparticle() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); void test_deletion(); void test_noDeletion(); diff --git a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp index 6baf8539d3..cfab3f8aee 100644 --- a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp +++ b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp @@ -40,7 +40,7 @@ public: tst_qquicklineextruder() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp index d8481efc47..8a80a93e3e 100644 --- a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp +++ b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp @@ -40,7 +40,7 @@ public: tst_qquickmaskextruder() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp index 8791d19db6..8dcce6a73c 100644 --- a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp +++ b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp @@ -40,7 +40,7 @@ public: tst_qquickparticlegroup() {} private slots: - void initTestCase(); + void initTestCase() override; void test_instantTransition(); }; diff --git a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp index 5f9db12144..705e47230c 100644 --- a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp +++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp @@ -40,7 +40,7 @@ public: tst_qquickparticlesystem() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); void test_affectorscrash(); }; diff --git a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp index c0d7d38512..8e63c1802b 100644 --- a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp +++ b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp @@ -40,7 +40,7 @@ public: tst_qquickpointattractor() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp index 5cc23e0306..ae5bfe406a 100644 --- a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp +++ b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp @@ -40,7 +40,7 @@ public: tst_qquickpointdirection() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp index 414e2d36f7..6447523cd1 100644 --- a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp +++ b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp @@ -40,7 +40,7 @@ public: tst_qquickrectangleextruder() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp index ca5d9171f9..4f803b9b64 100644 --- a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp +++ b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp @@ -40,7 +40,7 @@ public: tst_qquickspritegoal() {} private slots: - void initTestCase(); + void initTestCase() override; void test_instantTransition(); }; diff --git a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp index 2f45263c37..a96c6e15ef 100644 --- a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp +++ b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp @@ -40,7 +40,7 @@ public: tst_qquicktargetdirection() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp index 27d9bf01c9..a6b73e4f1d 100644 --- a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp +++ b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp @@ -40,7 +40,7 @@ public: tst_qquicktrailemitter() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp index 74fafdc1d2..69d47ffa1f 100644 --- a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp +++ b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp @@ -40,7 +40,7 @@ public: tst_qquickturbulence() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/particles/qquickwander/tst_qquickwander.cpp b/tests/auto/particles/qquickwander/tst_qquickwander.cpp index 51ef7a272e..8df00184b4 100644 --- a/tests/auto/particles/qquickwander/tst_qquickwander.cpp +++ b/tests/auto/particles/qquickwander/tst_qquickwander.cpp @@ -40,7 +40,7 @@ public: tst_qquickwander() {} private slots: - void initTestCase(); + void initTestCase() override; void test_basic(); }; diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp b/tests/auto/qml/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp index a22c94e4c4..c6e2545ebf 100644 --- a/tests/auto/qml/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp +++ b/tests/auto/qml/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp @@ -78,7 +78,7 @@ class TestAnimation : public QAbstractAnimationJob { public: TestAnimation(int duration = 250) : m_duration(duration) {} - int duration() const { return m_duration; } + int duration() const override { return m_duration; } private: int m_duration; @@ -92,10 +92,10 @@ public: { } - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { if (event->timerId() == id) stop(); @@ -118,7 +118,7 @@ private: class StateChangeListener: public QAnimationJobChangeListener { public: - virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State) + void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State) override { states << newState; } @@ -134,7 +134,7 @@ class FinishedListener: public QAnimationJobChangeListener public: FinishedListener() {} - virtual void animationFinished(QAbstractAnimationJob *) { ++m_count; } + void animationFinished(QAbstractAnimationJob *) override { ++m_count; } void clear() { m_count = 0; } int count() { return m_count; } diff --git a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp index 1d644bf9b5..dba6e531be 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp +++ b/tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp @@ -48,7 +48,7 @@ public: int m_updateCurrentTimeCount = 0; protected: - void updateCurrentTime(int currentTime) + void updateCurrentTime(int currentTime) override { QPauseAnimationJob::updateCurrentTime(currentTime); ++m_updateCurrentTimeCount; @@ -59,7 +59,7 @@ class TestableGenericAnimation : public QAbstractAnimationJob { public: TestableGenericAnimation(int duration = 250) : m_duration(duration) {} - int duration() const { return m_duration; } + int duration() const override { return m_duration; } private: int m_duration; diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp b/tests/auto/qml/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp index e8872ebc58..d870c9d4da 100644 --- a/tests/auto/qml/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp +++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp @@ -88,7 +88,7 @@ class TestAnimation : public QAbstractAnimationJob { public: TestAnimation(int duration = 250) : m_duration(duration) {} - int duration() const { return m_duration; } + int duration() const override { return m_duration; } private: int m_duration; @@ -100,7 +100,7 @@ public: TestValueAnimation(int duration = 250) : TestAnimation(duration) {} - void updateCurrentTime(int msecs) + void updateCurrentTime(int msecs) override { if (msecs >= duration()) value = end; @@ -116,10 +116,10 @@ class UncontrolledAnimation : public QObject, public QAbstractAnimationJob { Q_OBJECT public: - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void updateCurrentTime(int currentTime) + void updateCurrentTime(int currentTime) override { if (currentTime >= 250) stop(); @@ -129,9 +129,9 @@ protected: class StateChangeListener: public QAnimationJobChangeListener { public: - virtual void animationStateChanged( + void animationStateChanged( QAbstractAnimationJob *job, QAbstractAnimationJob::State newState, - QAbstractAnimationJob::State) + QAbstractAnimationJob::State) override { states << newState; if (beEvil) { @@ -153,7 +153,7 @@ class FinishedListener: public QAnimationJobChangeListener public: FinishedListener() {} - virtual void animationFinished(QAbstractAnimationJob *) { ++m_count; } + void animationFinished(QAbstractAnimationJob *) override { ++m_count; } void clear() { m_count = 0; } int count() { return m_count; } @@ -1530,7 +1530,7 @@ class ClearFinishedListener: public QAnimationJobChangeListener public: ClearFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {} - virtual void animationFinished(QAbstractAnimationJob *) + void animationFinished(QAbstractAnimationJob *) override { group->clear(); } @@ -1543,7 +1543,7 @@ class RefillFinishedListener: public QAnimationJobChangeListener public: RefillFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {} - virtual void animationFinished(QAbstractAnimationJob *) + void animationFinished(QAbstractAnimationJob *) override { group->stop(); group->clear(); diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp index 7815987870..b90844bd10 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp @@ -57,7 +57,7 @@ private: private slots: - void initTestCase(); + void initTestCase() override; void checkPortRange(); void name(); void version(); diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h index 190909dc44..ad24eaa7f8 100644 --- a/tests/auto/qml/debugger/shared/debugutil_p.h +++ b/tests/auto/qml/debugger/shared/debugutil_p.h @@ -92,7 +92,7 @@ signals: void serverMessage(const QByteArray &); protected: - virtual void messageReceived(const QByteArray &ba); + void messageReceived(const QByteArray &ba) override; private: QByteArray lastMsg; diff --git a/tests/auto/qml/debugger/shared/qqmldebugtestservice.h b/tests/auto/qml/debugger/shared/qqmldebugtestservice.h index 9c39c0893d..cd42ca5379 100644 --- a/tests/auto/qml/debugger/shared/qqmldebugtestservice.h +++ b/tests/auto/qml/debugger/shared/qqmldebugtestservice.h @@ -39,9 +39,9 @@ public: QQmlDebugTestService(const QString &s, float version = 1, QObject *parent = 0); protected: - virtual void messageReceived(const QByteArray &ba); - virtual void stateAboutToBeChanged(State state); - virtual void stateChanged(State state); + void messageReceived(const QByteArray &ba) override; + void stateAboutToBeChanged(State state) override; + void stateChanged(State state) override; }; #endif // QQMLDEBUGTESTSERVICE_H diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp index b999b5b9d1..9cce35aaf0 100644 --- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp +++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp @@ -46,7 +46,7 @@ class tst_qmlcachegen: public QQmlDataTest Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void loadGeneratedFile(); void translationExpressionSupport(); diff --git a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp index 295f2a31e3..17e67269f3 100644 --- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp +++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp @@ -42,7 +42,7 @@ public: tst_qmlplugindump(); private slots: - void initTestCase(); + void initTestCase() override; void builtins(); void singleton(); void compositeWithinSingleton(); diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index f636e527c3..365e40dfeb 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -44,7 +44,7 @@ public: private slots: - void initTestCase(); + void initTestCase() override; void basicLoading(); void testNonResolvedPath(); void application_data(); diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index 0124b6c604..3f626b002b 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -1716,8 +1716,8 @@ class FloatingQObject : public QObject, public QQmlParserStatus public: FloatingQObject() {} - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() override; + void componentComplete() override; }; class ClashingNames : public QObject diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 8554955a39..8e19f7cbe3 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -75,7 +75,7 @@ public: tst_qqmlecmascript() {} private slots: - void initTestCase(); + void initTestCase() override; void arrayIncludesValueType(); void assignBasicTypes(); void assignDate_data(); diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp index 1650a3a1d6..34e5d4d145 100644 --- a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp +++ b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp @@ -50,7 +50,7 @@ public: tst_qqmlincubator() {} private slots: - void initTestCase(); + void initTestCase() override; void incubationMode(); void objectDeleted(); diff --git a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp index cbb7ebb0ff..21bde0dd14 100644 --- a/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp +++ b/tests/auto/qml/qqmlitemmodels/tst_qqmlitemmodels.cpp @@ -48,7 +48,7 @@ public: tst_qqmlitemmodels() {} private slots: - void initTestCase(); + void initTestCase() override; void modelIndex(); void persistentModelIndex(); diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 4f3071f4c4..66960595d2 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -85,7 +85,7 @@ class tst_qqmllanguage : public QQmlDataTest Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); void errors_data(); diff --git a/tests/auto/qml/qqmllistreference/tst_qqmllistreference.cpp b/tests/auto/qml/qqmllistreference/tst_qqmllistreference.cpp index c6accb3908..92025cfb11 100644 --- a/tests/auto/qml/qqmllistreference/tst_qqmllistreference.cpp +++ b/tests/auto/qml/qqmllistreference/tst_qqmllistreference.cpp @@ -49,7 +49,7 @@ private: void modeData(); private slots: - void initTestCase(); + void initTestCase() override; void qmllistreference(); void qmllistreference_invalid(); void isValid(); diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp index 41537192d3..af285fb58b 100644 --- a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp +++ b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp @@ -43,7 +43,7 @@ class tst_QQmlMetaObject : public QQmlDataTest { Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void property_data(); void property(); diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp index 51ecc92ffb..02399fdcdf 100644 --- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp +++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp @@ -45,7 +45,7 @@ public: tst_qqmlmetatype() {} private slots: - void initTestCase(); + void initTestCase() override; void qmlParserStatusCast(); void qmlPropertyValueSourceCast(); diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index 72f38f16d6..ea5b44f1b6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -60,7 +60,7 @@ class tst_qqmlmoduleplugin : public QQmlDataTest public: private slots: - virtual void initTestCase(); + void initTestCase() override; void importsPlugin(); void importsPlugin_data(); void importsMixedQmlCppPlugin(); diff --git a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp index 02e11f156f..1ac05df62a 100644 --- a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp +++ b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp @@ -48,7 +48,7 @@ public: tst_qqmlparser(); private slots: - void initTestCase(); + void initTestCase() override; #if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled void qmlParser_data(); void qmlParser(); diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp index 4968d4e97f..63029f16dd 100644 --- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp +++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp @@ -143,7 +143,7 @@ public: tst_qqmlproperty() {} private slots: - void initTestCase(); + void initTestCase() override; // Constructors void qmlmetaproperty(); diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp index 75ef397bba..f76249ffad 100644 --- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp +++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp @@ -42,7 +42,7 @@ public: tst_QQmlPropertyMap() {} private slots: - void initTestCase(); + void initTestCase() override; void insert(); void insertMany(); diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp index 9406ba5d6a..ba21320bf4 100644 --- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp +++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp @@ -59,7 +59,7 @@ public: tst_qqmlqt() {} private slots: - void initTestCase(); + void initTestCase() override; void enums(); void rgba(); void hsla(); diff --git a/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp b/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp index 189321921a..60daeb0724 100644 --- a/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp +++ b/tests/auto/qml/qqmlsettings/tst_qqmlsettings.cpp @@ -41,7 +41,7 @@ class tst_QQmlSettings : public QQmlDataTest Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void init(); void cleanup(); diff --git a/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp b/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp index 28f9c9a0c2..654877c7ea 100644 --- a/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp +++ b/tests/auto/qml/qqmlsqldatabase/tst_qqmlsqldatabase.cpp @@ -54,7 +54,7 @@ public: } private slots: - void initTestCase(); + void initTestCase() override; void checkDatabasePath(); diff --git a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp index d95d378adb..c0bc090bd9 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp +++ b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp @@ -53,7 +53,7 @@ public: tst_qqmlvaluetypeproviders() {} private slots: - void initTestCase(); + void initTestCase() override; void qtqmlValueTypes(); // This test function _must_ be the first test function run. void qtquickValueTypes(); diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp index 80360b0912..cf02195d52 100644 --- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp +++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp @@ -50,7 +50,7 @@ public: tst_qqmlvaluetypes() {} private slots: - void initTestCase(); + void initTestCase() override; void point(); void pointf(); diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp index 3892580f3c..401152d575 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp +++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp @@ -52,7 +52,7 @@ public: tst_qqmlxmlhttprequest() {} private slots: - void initTestCase(); + void initTestCase() override; void domExceptionCodes(); void callbackException(); diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp index 10c5382455..d49e9b952b 100644 --- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp +++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp @@ -57,7 +57,7 @@ public slots: } private slots: - void initTestCase(); + void initTestCase() override; void basicProperties(); void status(); void showFiles(); diff --git a/tests/auto/quick/nodes/tst_nodestest.cpp b/tests/auto/quick/nodes/tst_nodestest.cpp index af2121f6a5..fa53ebfa02 100644 --- a/tests/auto/quick/nodes/tst_nodestest.cpp +++ b/tests/auto/quick/nodes/tst_nodestest.cpp @@ -83,7 +83,7 @@ public: NodesTest(); private Q_SLOTS: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); // Root nodes diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp index e5c2d5b979..0312ed0141 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp @@ -50,7 +50,7 @@ public: {} private slots: - void initTestCase(); + void initTestCase() override; void touchDrag(); void touchesThenPinch(); diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp index 9c9ca2fe00..c33c70b9e9 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp @@ -51,7 +51,7 @@ public: {} private slots: - void initTestCase(); + void initTestCase() override; void defaultPropertyValues(); void touchDrag_data(); diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp index 82511e57aa..6b0f574178 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/tst_qquickpointerhandler.cpp @@ -237,7 +237,7 @@ public: {} private slots: - void initTestCase(); + void initTestCase() override; void touchEventDelivery_data(); void touchEventDelivery(); diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp index 8e6f9deb7f..a2415fedd7 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp @@ -52,7 +52,7 @@ public: {} private slots: - void initTestCase(); + void initTestCase() override; void singleTouch(); void tabletStylus(); diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp index 7e7441685f..8457488cd9 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp @@ -54,7 +54,7 @@ public: {} private slots: - void initTestCase(); + void initTestCase() override; void touchGesturePolicyDragThreshold(); void mouseGesturePolicyDragThreshold(); diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp index c09e54c8b6..4c192374ee 100644 --- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp +++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp @@ -67,7 +67,7 @@ public: virtual ~tst_QQuickAccessible(); public slots: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); void init(); void cleanup(); diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp index 41a8b4d057..7a56c370d5 100644 --- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp +++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp @@ -45,7 +45,7 @@ public: tst_qquickanimatedsprite(){} private slots: - void initTestCase(); + void initTestCase() override; void test_properties(); void test_runningChangedSignal(); void test_startStop(); diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp index f903256d49..53216da5b7 100644 --- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp +++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp @@ -55,7 +55,7 @@ public: tst_qquickanimations() {} private slots: - void initTestCase() + void initTestCase() override { QQmlEngine engine; // ensure types are registered QQmlDataTest::initTestCase(); diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index 4d63803e78..94d603654d 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -43,7 +43,7 @@ public: tst_qquickfontloader(); private slots: - void initTestCase(); + void initTestCase() override; void noFont(); void localFont(); void failLocalFont(); diff --git a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp index 5e7ab02537..5a77215624 100644 --- a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp +++ b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp @@ -144,7 +144,7 @@ class tst_QQuickFramebufferObject: public QQmlDataTest Q_OBJECT public: private slots: - void initTestCase(); + void initTestCase() override; void testThatStuffWorks_data(); void testThatStuffWorks(); diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 976a7e90ba..c7007cf997 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -64,7 +64,7 @@ public: tst_qquickimage(); private slots: - void initTestCase(); + void initTestCase() override; void cleanup(); void noSource(); void imageSource(); diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index 7860f5677a..d38f6b4e54 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -123,7 +123,7 @@ public: : QQuickWindow() {} - virtual bool event(QEvent *event) + bool event(QEvent *event) override { return QQuickWindow::event(event); } @@ -174,7 +174,7 @@ class tst_qquickitem : public QQmlDataTest public: private slots: - void initTestCase(); + void initTestCase() override; void noWindow(); void simpleFocus(); diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index ec3ce69433..3170fb5918 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -51,7 +51,7 @@ public: tst_QQuickItem(); private slots: - void initTestCase(); + void initTestCase() override; void cleanup(); void activeFocusOnTab(); diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp index 37fa286103..13a3378905 100644 --- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp +++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp @@ -49,7 +49,7 @@ public: tst_qquickpixmapcache() {} private slots: - void initTestCase(); + void initTestCase() override; void single(); void single_data(); void parallel(); @@ -340,7 +340,7 @@ public: MyPixmapProvider() : QQuickImageProvider(Pixmap) {} - virtual QPixmap requestPixmap(const QString &d, QSize *, const QSize &) { + QPixmap requestPixmap(const QString &d, QSize *, const QSize &) override { Q_UNUSED(d); QPixmap pix(800, 600); pix.fill(fillColor); diff --git a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp index 8f026199ea..539ac25adb 100644 --- a/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp +++ b/tests/auto/quick/qquickrendercontrol/tst_qquickrendercontrol.cpp @@ -80,7 +80,7 @@ class tst_RenderControl : public QQmlDataTest Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); void renderAndReadBackWithRhi_data(); void renderAndReadBackWithRhi(); diff --git a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp index fa5a0ed384..4115c27910 100644 --- a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp +++ b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp @@ -73,7 +73,7 @@ public: tst_qquickshadereffect(); private slots: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); void testConnection(); void deleteSourceItem(); diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp index db72b09023..3fe71ade22 100644 --- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp +++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp @@ -138,7 +138,7 @@ private: QByteArray fullDataPath(const QString &path) const; private slots: - void initTestCase(); + void initTestCase() override; void basicChanges(); void attachedPropertyChanges(); diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 746f27447b..7ae0476f15 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -384,7 +384,7 @@ public: tst_qquickvisualdatamodel(); private slots: - void initTestCase(); + void initTestCase() override; void cleanupTestCase(); void rootIndex(); void updateLayout_data(); diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp index 8e79f89dc6..0cb3ff428a 100644 --- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp +++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp @@ -103,7 +103,7 @@ class tst_SceneGraph : public QQmlDataTest Q_OBJECT private slots: - void initTestCase(); + void initTestCase() override; void manyWindows_data(); void manyWindows(); diff --git a/tests/auto/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h index 4f537e3c4f..42cc50e028 100644 --- a/tests/auto/shared/testhttpserver.h +++ b/tests/auto/shared/testhttpserver.h @@ -113,7 +113,7 @@ public: QString urlString(const QString &documentPath) const; protected: - void run(); + void run() override; private: void start(); diff --git a/tests/benchmarks/quick/events/tst_events.cpp b/tests/benchmarks/quick/events/tst_events.cpp index 438e9bf666..1033dc30b6 100644 --- a/tests/benchmarks/quick/events/tst_events.cpp +++ b/tests/benchmarks/quick/events/tst_events.cpp @@ -52,7 +52,7 @@ private slots: void touchToMousePressMove(); public slots: - void initTestCase() { + void initTestCase() override { QQmlDataTest::initTestCase(); window.setBaseSize(QSize(400, 400)); window.setSource(testFileUrl("mouseevent.qml")); diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp index 2c28b5c914..0e0f79274d 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp +++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp @@ -57,7 +57,7 @@ public: tst_Scenegraph(); private Q_SLOTS: - void initTestCase(); + void initTestCase() override; void cleanup(); #ifdef TEXTLESS_TEST void testNoTextRendering_data(); |