Replace Q_DECL_OVERRIDE with override

Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

294 files changed, 1105 insertions, 1105 deletions

diff --git a/src/animation/backend/additiveclipblend_p.h b/src/animation/backend/additiveclipblend_p.h
index b3fe240ed..83c062cf1 100644
--- a/src/animation/backend/additiveclipblend_p.h
+++ b/src/animation/backend/additiveclipblend_p.h
@@ -73,17 +73,17 @@ public:
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
 
-    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const override
     {
         return { m_baseClipId, m_additiveClipId };
     }
 
-    inline double duration() const Q_DECL_OVERRIDE
+    inline double duration() const override
     {
         ClipBlendNode *node = clipBlendNodeManager()->lookupNode(m_baseClipId);
         Q_ASSERT(node);
diff --git a/src/animation/backend/animationclip_p.h b/src/animation/backend/animationclip_p.h
index 9eb94d45e..25f5b5cc4 100644
--- a/src/animation/backend/animationclip_p.h
+++ b/src/animation/backend/animationclip_p.h
@@ -72,7 +72,7 @@ public:
     QUrl source() const { return m_source; }
     void setStatus(QAnimationClipLoader::Status status);
     QAnimationClipLoader::Status status() const { return m_status; }
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void addDependingClipAnimator(const Qt3DCore::QNodeId &id);
     void addDependingBlendedClipAnimator(const Qt3DCore::QNodeId &id);
diff --git a/src/animation/backend/blendedclipanimator_p.h b/src/animation/backend/blendedclipanimator_p.h
index d9f89b5f9..f73a00cc3 100644
--- a/src/animation/backend/blendedclipanimator_p.h
+++ b/src/animation/backend/blendedclipanimator_p.h
@@ -64,7 +64,7 @@ public:
     BlendedClipAnimator();
 
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     Qt3DCore::QNodeId blendTreeRootId() const;
     Qt3DCore::QNodeId mapperId() const { return m_mapperId; }
diff --git a/src/animation/backend/buildblendtreesjob_p.h b/src/animation/backend/buildblendtreesjob_p.h
index cf48b10a9..a14552cb9 100644
--- a/src/animation/backend/buildblendtreesjob_p.h
+++ b/src/animation/backend/buildblendtreesjob_p.h
@@ -69,7 +69,7 @@ public:
     void setBlendedClipAnimators(const QVector<HBlendedClipAnimator> &blendedClipAnimatorHandles);
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     QVector<HBlendedClipAnimator> m_blendedClipAnimatorHandles;
diff --git a/src/animation/backend/channelmapper_p.h b/src/animation/backend/channelmapper_p.h
index 710de01ab..9762ee8f1 100644
--- a/src/animation/backend/channelmapper_p.h
+++ b/src/animation/backend/channelmapper_p.h
@@ -69,7 +69,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void setMappingIds(const QVector<Qt3DCore::QNodeId> &mappingIds) { m_mappingIds = mappingIds; }
     QVector<Qt3DCore::QNodeId> mappingIds() const { return m_mappingIds; }
diff --git a/src/animation/backend/channelmapping_p.h b/src/animation/backend/channelmapping_p.h
index 5cebbaf55..daf6e4148 100644
--- a/src/animation/backend/channelmapping_p.h
+++ b/src/animation/backend/channelmapping_p.h
@@ -76,7 +76,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void setChannelName(const QString &channelName) { m_channelName = channelName; }
     QString channelName() const { return m_channelName; }
diff --git a/src/animation/backend/clipanimator_p.h b/src/animation/backend/clipanimator_p.h
index b3389f8da..19cbff7a7 100644
--- a/src/animation/backend/clipanimator_p.h
+++ b/src/animation/backend/clipanimator_p.h
@@ -78,7 +78,7 @@ public:
     void setLoops(int loops) { m_loops = loops; }
     int loops() const { return m_loops; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void setHandler(Handler *handler) { m_handler = handler; }
 
     // Called by jobs
diff --git a/src/animation/backend/clipblendnode_p.h b/src/animation/backend/clipblendnode_p.h
index 17eeed9b3..2d243fe0c 100644
--- a/src/animation/backend/clipblendnode_p.h
+++ b/src/animation/backend/clipblendnode_p.h
@@ -88,7 +88,7 @@ public:
 
 protected:
     explicit ClipBlendNode(BlendType blendType);
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
     virtual ClipResults doBlend(const QVector<ClipResults> &blendData) const = 0;
 
 private:
diff --git a/src/animation/backend/clipblendvalue_p.h b/src/animation/backend/clipblendvalue_p.h
index 6da800f98..a83d33674 100644
--- a/src/animation/backend/clipblendvalue_p.h
+++ b/src/animation/backend/clipblendvalue_p.h
@@ -64,25 +64,25 @@ public:
     inline Qt3DCore::QNodeId clipId() const { return m_clipId; }
     void setClipId(Qt3DCore::QNodeId clipId) { m_clipId = clipId; } // For unit tests
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
 
-    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const override
     {
         return { m_clipId };
     }
 
-    double duration() const Q_DECL_OVERRIDE;
+    double duration() const override;
 
     void setFormatIndices(Qt3DCore::QNodeId animatorId, const ComponentIndices &formatIndices);
     ComponentIndices formatIndices(Qt3DCore::QNodeId animatorId);
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &blendData) const Q_DECL_OVERRIDE;
+    ClipResults doBlend(const QVector<ClipResults> &blendData) const override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/animation/backend/evaluateblendclipanimatorjob_p.h b/src/animation/backend/evaluateblendclipanimatorjob_p.h
index a7822c8f9..7548168e9 100644
--- a/src/animation/backend/evaluateblendclipanimatorjob_p.h
+++ b/src/animation/backend/evaluateblendclipanimatorjob_p.h
@@ -73,7 +73,7 @@ public:
     HBlendedClipAnimator blendClipAnimator() const { return m_blendClipAnimatorHandle; }
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     HBlendedClipAnimator m_blendClipAnimatorHandle;
diff --git a/src/animation/backend/evaluateclipanimatorjob_p.h b/src/animation/backend/evaluateclipanimatorjob_p.h
index 866032dd1..c9b1a8f96 100644
--- a/src/animation/backend/evaluateclipanimatorjob_p.h
+++ b/src/animation/backend/evaluateclipanimatorjob_p.h
@@ -77,7 +77,7 @@ public:
     }
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     HClipAnimator m_clipAnimatorHandle;
diff --git a/src/animation/backend/findrunningclipanimatorsjob_p.h b/src/animation/backend/findrunningclipanimatorsjob_p.h
index 023f46303..6c81ee914 100644
--- a/src/animation/backend/findrunningclipanimatorsjob_p.h
+++ b/src/animation/backend/findrunningclipanimatorsjob_p.h
@@ -70,7 +70,7 @@ public:
     void setDirtyClipAnimators(const QVector<HClipAnimator> &animationClipHandles);
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     QVector<HClipAnimator> m_clipAnimatorHandles;
diff --git a/src/animation/backend/lerpclipblend_p.h b/src/animation/backend/lerpclipblend_p.h
index e09987759..ffcaf4186 100644
--- a/src/animation/backend/lerpclipblend_p.h
+++ b/src/animation/backend/lerpclipblend_p.h
@@ -73,17 +73,17 @@ public:
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
 
-    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> currentDependencyIds() const override
     {
         return { m_startClipId, m_endClipId };
     }
 
-    double duration() const Q_DECL_OVERRIDE;
+    double duration() const override;
 
 protected:
     ClipResults doBlend(const QVector<ClipResults> &blendData) const Q_DECL_FINAL;
diff --git a/src/animation/backend/loadanimationclipjob_p.h b/src/animation/backend/loadanimationclipjob_p.h
index f5d0a3b82..25de2c6b6 100644
--- a/src/animation/backend/loadanimationclipjob_p.h
+++ b/src/animation/backend/loadanimationclipjob_p.h
@@ -72,7 +72,7 @@ public:
     void clearDirtyAnimationClips();
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     QVector<HAnimationClip> m_animationClipHandles;
diff --git a/src/animation/frontend/qabstractanimationclip.h b/src/animation/frontend/qabstractanimationclip.h
index 377725fa1..6190550e6 100644
--- a/src/animation/frontend/qabstractanimationclip.h
+++ b/src/animation/frontend/qabstractanimationclip.h
@@ -62,7 +62,7 @@ Q_SIGNALS:
 
 protected:
     QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractAnimationClip)
diff --git a/src/animation/frontend/qadditiveclipblend.h b/src/animation/frontend/qadditiveclipblend.h
index 11731c702..0771bd032 100644
--- a/src/animation/frontend/qadditiveclipblend.h
+++ b/src/animation/frontend/qadditiveclipblend.h
@@ -74,7 +74,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAdditiveClipBlend)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DAnimation
diff --git a/src/animation/frontend/qanimationaspect.h b/src/animation/frontend/qanimationaspect.h
index 93f3318d9..bd3745fec 100644
--- a/src/animation/frontend/qanimationaspect.h
+++ b/src/animation/frontend/qanimationaspect.h
@@ -57,7 +57,7 @@ public:
     ~QAnimationAspect();
 
 private:
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override;
 
     Q_DECLARE_PRIVATE(QAnimationAspect)
     explicit QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent);
diff --git a/src/animation/frontend/qanimationclip.h b/src/animation/frontend/qanimationclip.h
index 6e606c598..4781641e0 100644
--- a/src/animation/frontend/qanimationclip.h
+++ b/src/animation/frontend/qanimationclip.h
@@ -72,7 +72,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAnimationClip)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qanimationcliploader.h b/src/animation/frontend/qanimationcliploader.h
index 20f0f14da..2106d0f31 100644
--- a/src/animation/frontend/qanimationcliploader.h
+++ b/src/animation/frontend/qanimationcliploader.h
@@ -78,11 +78,11 @@ Q_SIGNALS:
 
 protected:
     explicit QAnimationClipLoader(QAnimationClipLoaderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAnimationClipLoader)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qblendedclipanimator.h b/src/animation/frontend/qblendedclipanimator.h
index c227a05cc..064a83dc7 100644
--- a/src/animation/frontend/qblendedclipanimator.h
+++ b/src/animation/frontend/qblendedclipanimator.h
@@ -72,7 +72,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QBlendedClipAnimator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h
index fce59f6ab..a14fbcdd4 100644
--- a/src/animation/frontend/qchannelmapper.h
+++ b/src/animation/frontend/qchannelmapper.h
@@ -64,7 +64,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QChannelMapper)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qchannelmapping.h b/src/animation/frontend/qchannelmapping.h
index 08bda13aa..c321e8b36 100644
--- a/src/animation/frontend/qchannelmapping.h
+++ b/src/animation/frontend/qchannelmapping.h
@@ -80,7 +80,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QChannelMapping)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qclipanimator.h b/src/animation/frontend/qclipanimator.h
index 7b06f9878..dee544831 100644
--- a/src/animation/frontend/qclipanimator.h
+++ b/src/animation/frontend/qclipanimator.h
@@ -74,7 +74,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClipAnimator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qclipblendvalue.h b/src/animation/frontend/qclipblendvalue.h
index b18bfb57b..65ac0eb6c 100644
--- a/src/animation/frontend/qclipblendvalue.h
+++ b/src/animation/frontend/qclipblendvalue.h
@@ -73,7 +73,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClipBlendValue)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qclock.h b/src/animation/frontend/qclock.h
index d2bf91103..ea0f294d2 100644
--- a/src/animation/frontend/qclock.h
+++ b/src/animation/frontend/qclock.h
@@ -66,7 +66,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClock)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DAnimation
diff --git a/src/animation/frontend/qlerpclipblend.h b/src/animation/frontend/qlerpclipblend.h
index f6707a5a5..225b52e53 100644
--- a/src/animation/frontend/qlerpclipblend.h
+++ b/src/animation/frontend/qlerpclipblend.h
@@ -75,7 +75,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QLerpClipBlend)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DAnimation
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index a6c47c494..6b0490d91 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -117,13 +117,13 @@ public:
     QServiceLocator *services() const;
     QAbstractAspectJobManager *jobManager() const;
 
-    QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<QAspectJobPtr> jobsToExecute(qint64 time) override;
 
-    QBackendNode *createBackendNode(const QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
+    QBackendNode *createBackendNode(const QNodeCreatedChangeBasePtr &change) const override;
     void clearBackendNode(const QNodeDestroyedChangePtr &change) const;
 
-    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) override;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) override;
 
     virtual void onEngineAboutToShutdown();
 
diff --git a/src/core/aspects/qaspectthread_p.h b/src/core/aspects/qaspectthread_p.h
index 91fb363c5..8ae9ff86d 100644
--- a/src/core/aspects/qaspectthread_p.h
+++ b/src/core/aspects/qaspectthread_p.h
@@ -74,7 +74,7 @@ public:
     QAspectManager *aspectManager() const { return m_aspectManager; }
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     QAspectManager *m_aspectManager;
diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h
index fac71f057..d59860039 100644
--- a/src/core/jobs/qaspectjobmanager_p.h
+++ b/src/core/jobs/qaspectjobmanager_p.h
@@ -71,13 +71,13 @@ public:
     explicit QAspectJobManager(QObject *parent = 0);
     ~QAspectJobManager();
 
-    void initialize() Q_DECL_OVERRIDE;
+    void initialize() override;
 
-    void enqueueJobs(const QVector<QAspectJobPtr> &jobQueue) Q_DECL_OVERRIDE;
+    void enqueueJobs(const QVector<QAspectJobPtr> &jobQueue) override;
 
-    void waitForAllJobs() Q_DECL_OVERRIDE;
+    void waitForAllJobs() override;
 
-    void waitForPerThreadFunction(JobFunction func, void *arg) Q_DECL_OVERRIDE;
+    void waitForPerThreadFunction(JobFunction func, void *arg) override;
 
 private:
     QThreadPooler *m_threadPooler;
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index 91e3f5f3d..c81882719 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -95,15 +95,15 @@ public:
     AspectTaskRunnable();
     ~AspectTaskRunnable();
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
-    void setPooler(QThreadPooler *pooler) Q_DECL_OVERRIDE { m_pooler = pooler; }
+    void setPooler(QThreadPooler *pooler) override { m_pooler = pooler; }
 
-    void setReserved(bool reserved) Q_DECL_OVERRIDE { m_reserved = reserved; }
-    bool reserved() Q_DECL_OVERRIDE { return m_reserved; }
+    void setReserved(bool reserved) override { m_reserved = reserved; }
+    bool reserved() override { return m_reserved; }
 
-    int id() Q_DECL_OVERRIDE { return m_id; }
-    void setId(int id) Q_DECL_OVERRIDE { m_id = id; }
+    int id() override { return m_id; }
+    void setId(int id) override { m_id = id; }
 
     RunnableType type() const Q_DECL_OVERRIDE { return RunnableType::AspectTask; }
 
@@ -125,15 +125,15 @@ public:
                               QAtomicInt *atomicCount);
     ~SyncTaskRunnable();
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
-    void setPooler(QThreadPooler *pooler) Q_DECL_OVERRIDE { m_pooler = pooler; }
+    void setPooler(QThreadPooler *pooler) override { m_pooler = pooler; }
 
-    void setReserved(bool reserved) Q_DECL_OVERRIDE { m_reserved = reserved; }
-    bool reserved() Q_DECL_OVERRIDE { return m_reserved; }
+    void setReserved(bool reserved) override { m_reserved = reserved; }
+    bool reserved() override { return m_reserved; }
 
-    int id() Q_DECL_OVERRIDE { return m_id; }
-    void setId(int id) Q_DECL_OVERRIDE { m_id = id; }
+    int id() override { return m_id; }
+    void setId(int id) override { m_id = id; }
 
     RunnableType type() const Q_DECL_OVERRIDE { return RunnableType::SyncTask; }
 
diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h
index 4bcfdef75..ff8d6d5c2 100644
--- a/src/core/nodes/propertychangehandler_p.h
+++ b/src/core/nodes/propertychangehandler_p.h
@@ -97,7 +97,7 @@ public:
      * Custom implementation of qt_metacall which calls propertyChanged() on the receiver for
      * connected signals.
      */
-    int qt_metacall(QMetaObject::Call call, int methodId, void **args) Q_DECL_OVERRIDE;
+    int qt_metacall(QMetaObject::Call call, int methodId, void **args) override;
 
 private:
     Receiver *m_receiver;
diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h
index 6940f5623..358b3ab8e 100644
--- a/src/core/nodes/qbackendnode_p.h
+++ b/src/core/nodes/qbackendnode_p.h
@@ -70,9 +70,9 @@ class QT3DCORE_PRIVATE_EXPORT QBackendNodePrivate
 public:
     QBackendNodePrivate(QBackendNode::Mode mode);
 
-    void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE;
-    void notifyObservers(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void setArbiter(QLockableObserverInterface *arbiter) override;
+    void notifyObservers(const QSceneChangePtr &e) override;
+    void sceneChangeEvent(const QSceneChangePtr &e) override;
     void setEnabled(bool enabled);
 
     static QBackendNodePrivate *get(QBackendNode *n);
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index 978f84ebe..dc7dc62c1 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -73,7 +73,7 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QEntity)
 
-    QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 typedef QSharedPointer<QEntity> QEntityPtr;
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index ad9d2376e..a122993fe 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -79,11 +79,11 @@ public:
     virtual void setScene(QScene *scene);
     QScene *scene() const;
 
-    void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE;
+    void setArbiter(QLockableObserverInterface *arbiter) override;
 
     void notifyPropertyChange(const char *name, const QVariant &value);
     void notifyDynamicPropertyChange(const QByteArray &name, const QVariant &value);
-    void notifyObservers(const QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void notifyObservers(const QSceneChangePtr &change) override;
 
     void insertTree(QNode *treeRoot, int depth = 0);
     void updatePropertyTrackMode();
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 54ef6a207..87f96a178 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -105,9 +105,9 @@ public:
     void registerSceneObserver(QSceneObserverInterface *observer);
     void unregisterSceneObserver(QSceneObserverInterface *observer);
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;         // QLockableObserverInterface impl
-    void sceneChangeEventWithLock(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl
-    void sceneChangeEventWithLock(const QSceneChangeList &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl
+    void sceneChangeEvent(const QSceneChangePtr &e) override;         // QLockableObserverInterface impl
+    void sceneChangeEventWithLock(const QSceneChangePtr &e) override; // QLockableObserverInterface impl
+    void sceneChangeEventWithLock(const QSceneChangeList &e) override; // QLockableObserverInterface impl
 
     Q_INVOKABLE void setPostman(Qt3DCore::QAbstractPostman *postman);
     Q_INVOKABLE void setScene(Qt3DCore::QScene *scene);
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index cb2b1bdce..7e803f245 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -117,7 +117,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QTransform)
-    QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DCore
diff --git a/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
index 5994d87eb..d6dfe6892 100644
--- a/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/extras/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -71,7 +71,7 @@ class QNormalDiffuseMapAlphaMaterialPrivate: public QNormalDiffuseMapMaterialPri
 public:
     QNormalDiffuseMapAlphaMaterialPrivate();
 
-    void init() Q_DECL_OVERRIDE;
+    void init() override;
 
     Qt3DRender::QAlphaCoverage *m_alphaCoverage;
     Qt3DRender::QDepthTest *m_depthTest;
diff --git a/src/extras/defaults/qt3dwindow.h b/src/extras/defaults/qt3dwindow.h
index 6ec1bbf8b..73a6af278 100644
--- a/src/extras/defaults/qt3dwindow.h
+++ b/src/extras/defaults/qt3dwindow.h
@@ -110,8 +110,8 @@ public Q_SLOTS:
 Q_SIGNALS:
 
 protected:
-    void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
-    void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *e) override;
+    void resizeEvent(QResizeEvent *) override;
 
 private:
     Q_DECLARE_PRIVATE(Qt3DWindow)
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index 12bbf7ce3..d1a6917f5 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -238,7 +238,7 @@ public:
         , m_length(length)
     {}
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         const int verticesCount =
                 vertexCount(m_slices, m_rings, (m_hasTopEndcap + m_hasBottomEndcap));
@@ -259,7 +259,7 @@ public:
         return verticesData;
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const ConeVertexDataFunctor *otherFunctor = functor_cast<ConeVertexDataFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -298,7 +298,7 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         const int facesCount = faceCount(m_slices, m_rings, (m_hasTopEndcap + m_hasBottomEndcap));
 
@@ -319,7 +319,7 @@ public:
         return indicesBytes;
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const ConeIndexDataFunctor *otherFunctor = functor_cast<ConeIndexDataFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index 4051477a6..a6eb01d41 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -192,7 +192,7 @@ public:
         , m_length(length)
     {}
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         const int verticesCount = vertexCount(m_slices, m_rings);
         // vec3 pos, vec2 texCoord, vec3 normal
@@ -209,7 +209,7 @@ public:
         return verticesData;
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const CylinderVertexDataFunctor *otherFunctor = functor_cast<CylinderVertexDataFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -239,7 +239,7 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         const int facesCount = faceCount(m_slices, m_rings);
         const int indicesCount = facesCount * 3;
@@ -258,7 +258,7 @@ public:
         return indicesBytes;
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const CylinderIndexDataFunctor *otherFunctor = functor_cast<CylinderIndexDataFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index eae12ef39..92844335c 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -177,12 +177,12 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         return createSphereMeshVertexData(m_radius, m_rings, m_slices);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const SphereVertexDataFunctor *otherFunctor = functor_cast<SphereVertexDataFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -209,12 +209,12 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         return createSphereMeshIndexData(m_rings, m_slices);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const SphereIndexDataFunctor *otherFunctor = functor_cast<SphereIndexDataFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index 57c94ec95..ef14ee50d 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -164,12 +164,12 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         return createTorusVertexData(m_radius, m_minorRadius, m_rings, m_slices);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const TorusVertexDataFunctor *otherFunctor = functor_cast<TorusVertexDataFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -198,12 +198,12 @@ public:
     {
     }
 
-    QByteArray operator ()() Q_DECL_OVERRIDE
+    QByteArray operator ()() override
     {
         return createTorusIndexData(m_rings, m_slices);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+    bool operator ==(const QBufferDataGenerator &other) const override
     {
         const TorusIndexDataFunctor *otherFunctor = functor_cast<TorusIndexDataFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/extras/text/qtext2dentity_p.h b/src/extras/text/qtext2dentity_p.h
index 863431091..934e2087f 100644
--- a/src/extras/text/qtext2dentity_p.h
+++ b/src/extras/text/qtext2dentity_p.h
@@ -89,7 +89,7 @@ public:
     QVector<QGlyphRun> m_currentGlyphRuns;
     QDistanceFieldGlyphCache *m_glyphCache;
 
-    void setScene(Qt3DCore::QScene *scene) Q_DECL_OVERRIDE;
+    void setScene(Qt3DCore::QScene *scene) override;
 
     QFont m_font;
     QFont m_scaledFont; // ignore point or pixel size, set to default value
diff --git a/src/extras/text/qtextureatlas_p_p.h b/src/extras/text/qtextureatlas_p_p.h
index ca18a263a..5a1021bfa 100644
--- a/src/extras/text/qtextureatlas_p_p.h
+++ b/src/extras/text/qtextureatlas_p_p.h
@@ -118,8 +118,8 @@ class QTextureAtlasGenerator : public Qt3DRender::QTextureGenerator
 public:
     QTextureAtlasGenerator(const QTextureAtlasPrivate *texAtlas);
     ~QTextureAtlasGenerator();
-    Qt3DRender::QTextureDataPtr operator()() Q_DECL_OVERRIDE;
-    bool operator==(const QTextureGenerator &other) const Q_DECL_OVERRIDE;
+    Qt3DRender::QTextureDataPtr operator()() override;
+    bool operator==(const QTextureGenerator &other) const override;
 
     QT3D_FUNCTOR(QTextureAtlasGenerator)
 
diff --git a/src/input/backend/abstractaxisinput_p.h b/src/input/backend/abstractaxisinput_p.h
index 8ce43bce8..765e2214f 100644
--- a/src/input/backend/abstractaxisinput_p.h
+++ b/src/input/backend/abstractaxisinput_p.h
@@ -70,13 +70,13 @@ public:
     virtual void cleanup();
 
     inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; }
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     virtual float process(InputHandler *inputHandler, qint64 currentTime) = 0;
 
 protected:
     AbstractAxisInput();
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
 
     Qt3DCore::QNodeId m_sourceDevice;
 };
diff --git a/src/input/backend/action_p.h b/src/input/backend/action_p.h
index ee686413f..6a6a867c2 100644
--- a/src/input/backend/action_p.h
+++ b/src/input/backend/action_p.h
@@ -68,7 +68,7 @@ public:
     inline QVector<Qt3DCore::QNodeId> inputs() const { return m_inputs; }
     inline bool actionTriggered() const { return m_actionTriggered; }
     void setActionTriggered(bool actionTriggered);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h
index 3059f66cf..7f297b73b 100644
--- a/src/input/backend/actioninput_p.h
+++ b/src/input/backend/actioninput_p.h
@@ -69,9 +69,9 @@ public:
 
     inline QVector<int> buttons() const { return m_buttons; }
     inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; }
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
-    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+    bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/analogaxisinput_p.h b/src/input/backend/analogaxisinput_p.h
index 154ef5378..640aff709 100644
--- a/src/input/backend/analogaxisinput_p.h
+++ b/src/input/backend/analogaxisinput_p.h
@@ -68,7 +68,7 @@ public:
     inline int axis() const { return m_axis; }
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
-    float process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+    float process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h
index 44966554d..8a74de85f 100644
--- a/src/input/backend/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
@@ -66,7 +66,7 @@ class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob
 public:
     explicit AssignKeyboardFocusJob(Qt3DCore::QNodeId keyboardDevice);
     void setInputHandler(InputHandler *handler);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/axis_p.h b/src/input/backend/axis_p.h
index e62f70d34..73150c522 100644
--- a/src/input/backend/axis_p.h
+++ b/src/input/backend/axis_p.h
@@ -68,7 +68,7 @@ public:
     inline QVector<Qt3DCore::QNodeId> inputs() const { return m_inputs; }
     inline float axisValue() const { return m_axisValue; }
     void setAxisValue(float axisValue);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h
index 7d6799eb0..246020cb3 100644
--- a/src/input/backend/axisaccumulator_p.h
+++ b/src/input/backend/axisaccumulator_p.h
@@ -78,7 +78,7 @@ public:
     float velocity() const Q_DECL_NOTHROW { return  m_velocity; }
     void setVelocity(float velocity);
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void stepIntegration(AxisManager *axisManager, float dt);
 
diff --git a/src/input/backend/axissetting_p.h b/src/input/backend/axissetting_p.h
index 190312bd8..c26d3850c 100644
--- a/src/input/backend/axissetting_p.h
+++ b/src/input/backend/axissetting_p.h
@@ -69,7 +69,7 @@ public:
     inline bool isSmoothEnabled() const { return m_smooth; }
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/buttonaxisinput_p.h b/src/input/backend/buttonaxisinput_p.h
index 05724567c..5ed5b6b52 100644
--- a/src/input/backend/buttonaxisinput_p.h
+++ b/src/input/backend/buttonaxisinput_p.h
@@ -80,7 +80,7 @@ public:
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
-    float process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+    float process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void updateSpeedRatio(qint64 currentTime, UpdateType type);
diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h
index 16aaf3e5b..c3ee1e467 100644
--- a/src/input/backend/genericdevicebackendnode_p.h
+++ b/src/input/backend/genericdevicebackendnode_p.h
@@ -73,10 +73,10 @@ public:
     void updateEvents();
 
     // QAbstractPhysicalDeviceBackendNode interface
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void cleanup() Q_DECL_OVERRIDE;
-    float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE;
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
+    void cleanup() override;
+    float axisValue(int axisIdentifier) const override;
+    bool isButtonPressed(int buttonIdentifier) const override;
 
 private:
     QHash<int, qreal> m_axesValues;
@@ -89,9 +89,9 @@ class GenericDeviceBackendFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit GenericDeviceBackendFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     QInputAspect *m_inputAspect;
diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h
index 95557a00d..3d3a53c50 100644
--- a/src/input/backend/inputchord_p.h
+++ b/src/input/backend/inputchord_p.h
@@ -73,9 +73,9 @@ public:
     void setStartTime(qint64 time);
     void reset();
     bool actionTriggered(Qt3DCore::QNodeId input);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
-    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+    bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index a9fa2dd2f..b9a577c3e 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -75,9 +75,9 @@ public:
     bool sequenceTriggered() const;
     void reset();
     bool actionTriggered(Qt3DCore::QNodeId input, const qint64 currentTime);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
-    bool process(InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE;
+    bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index 2fee6c946..05beb5c67 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -69,7 +69,7 @@ public:
     inline QObject *eventSource() const { return m_eventSource; }
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
@@ -82,9 +82,9 @@ class InputSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit InputSettingsFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h
index 611a06233..781e8ead5 100644
--- a/src/input/backend/keyboarddevice_p.h
+++ b/src/input/backend/keyboarddevice_p.h
@@ -71,15 +71,15 @@ class Q_AUTOTEST_EXPORT KeyboardDevice : public Qt3DInput::QAbstractPhysicalDevi
 {
 public:
     KeyboardDevice();
-    void cleanup() Q_DECL_OVERRIDE;
+    void cleanup() override;
 
     void requestFocusForInput(Qt3DCore::QNodeId inputId);
     void setInputHandler(InputHandler *handler);
 
     void setCurrentFocusItem(Qt3DCore::QNodeId input);
 
-    float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE;
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE;
+    float axisValue(int axisIdentifier) const override;
+    bool isButtonPressed(int buttonIdentifier) const override;
 
     void updateKeyEvents(const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events);
 
@@ -87,7 +87,7 @@ public:
     inline Qt3DCore::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; }
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) override;
 
 private:
     void setButtonValue(int key, bool value);
@@ -268,9 +268,9 @@ class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     QInputAspect *m_inputAspect;
diff --git a/src/input/backend/keyboardeventfilter_p.h b/src/input/backend/keyboardeventfilter_p.h
index 46b8071cd..bcf062506 100644
--- a/src/input/backend/keyboardeventfilter_p.h
+++ b/src/input/backend/keyboardeventfilter_p.h
@@ -69,7 +69,7 @@ public:
     inline InputHandler *inputHandler() const { return m_inputHandler; }
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *obj, QEvent *e) override;
 
 private:
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h
index e2aeab4f3..cc1575f2a 100644
--- a/src/input/backend/keyboardhandler_p.h
+++ b/src/input/backend/keyboardhandler_p.h
@@ -75,7 +75,7 @@ public:
 
     inline bool focus() const { return m_focus; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 protected:
     void requestFocus();
@@ -94,9 +94,9 @@ class KeyboardHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit KeyboardHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h
index 1456f0878..be2364ac9 100644
--- a/src/input/backend/keyeventdispatcherjob_p.h
+++ b/src/input/backend/keyeventdispatcherjob_p.h
@@ -67,7 +67,7 @@ class KeyEventDispatcherJob : public Qt3DCore::QAspectJob
 public:
     explicit KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events);
     void setInputHandler(InputHandler *handler);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h
index 38d4e2dd5..e24d7a359 100644
--- a/src/input/backend/logicaldevice_p.h
+++ b/src/input/backend/logicaldevice_p.h
@@ -71,7 +71,7 @@ public:
     inline QVector<Qt3DCore::QNodeId> axes() const { return m_axes; }
     inline QVector<Qt3DCore::QNodeId> actions() const { return m_actions; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h
index a085194ff..510e9c9b5 100644
--- a/src/input/backend/mousedevice_p.h
+++ b/src/input/backend/mousedevice_p.h
@@ -95,8 +95,8 @@ public:
     void setInputHandler(InputHandler *handler);
     InputHandler *inputHandler() const;
 
-    float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE;
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE;
+    float axisValue(int axisIdentifier) const override;
+    bool isButtonPressed(int buttonIdentifier) const override;
 
     void updateMouseEvents(const QList<QT_PREPEND_NAMESPACE(QMouseEvent)> &events);
 #if QT_CONFIG(wheelevent)
@@ -108,7 +108,7 @@ public:
     bool wasPressed() const;
     float sensitivity() const;
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
@@ -126,9 +126,9 @@ class MouseDeviceFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseDeviceFunctor(Qt3DInput::QInputAspect *inputAspect, InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     QInputAspect *m_inputAspect;
diff --git a/src/input/backend/mouseeventfilter_p.h b/src/input/backend/mouseeventfilter_p.h
index 340524a61..135b1afcf 100644
--- a/src/input/backend/mouseeventfilter_p.h
+++ b/src/input/backend/mouseeventfilter_p.h
@@ -69,7 +69,7 @@ public:
     inline InputHandler *inputHandler() const { return m_inputHandler; }
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *obj, QEvent *e) override;
 
 private:
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h
index ae484d8d6..3d32d9864 100644
--- a/src/input/backend/mousehandler_p.h
+++ b/src/input/backend/mousehandler_p.h
@@ -75,7 +75,7 @@ public:
 #endif
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void setDevice(Qt3DCore::QNodeId device);
 
 private:
@@ -90,9 +90,9 @@ class MouseHandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit MouseHandlerFunctor(InputHandler *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
index 272143c45..339ad7324 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode_p.h
+++ b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
@@ -71,7 +71,7 @@ class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNode : public
 public:
     explicit QAbstractPhysicalDeviceBackendNode(QBackendNode::Mode mode);
     virtual void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void setInputAspect(QInputAspect *aspect);
     QInputAspect *inputAspect() const;
@@ -83,7 +83,7 @@ public:
 protected:
     QAbstractPhysicalDeviceBackendNode(QAbstractPhysicalDeviceBackendNodePrivate &dd);
 
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
 
     Q_DECLARE_PRIVATE(QAbstractPhysicalDeviceBackendNode)
 };
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index 8c0abae4e..bf93bc955 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -75,7 +75,7 @@ public:
 protected:
     QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = nullptr);
     Q_DECLARE_PRIVATE(QAbstractPhysicalDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
index 6d44ad2cd..64c634733 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h
+++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
@@ -77,21 +77,21 @@ public:
     QString deviceName() const;
     DeviceStatus status() const;
 
-    int axisCount() const Q_DECL_OVERRIDE;
-    int buttonCount() const Q_DECL_OVERRIDE;
-    QStringList axisNames() const Q_DECL_OVERRIDE;
-    QStringList buttonNames() const Q_DECL_OVERRIDE;
-    int axisIdentifier(const QString &name) const Q_DECL_OVERRIDE;
-    int buttonIdentifier(const QString &name) const Q_DECL_OVERRIDE;
+    int axisCount() const override;
+    int buttonCount() const override;
+    QStringList axisNames() const override;
+    QStringList buttonNames() const override;
+    int axisIdentifier(const QString &name) const override;
+    int buttonIdentifier(const QString &name) const override;
 
 Q_SIGNALS:
     void statusChanged(QAbstractPhysicalDeviceProxy::DeviceStatus status);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
     QAbstractPhysicalDeviceProxy(QAbstractPhysicalDeviceProxyPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 
 private:
     void setDevice(QAbstractPhysicalDevice *device);
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index 937f2ec99..4b282e0b9 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -68,11 +68,11 @@ Q_SIGNALS:
     void activeChanged(bool isActive);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAction)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index 580afaf2e..c4c2c934f 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -74,7 +74,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QActionInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qanalogaxisinput.h b/src/input/frontend/qanalogaxisinput.h
index f5523d0dd..9fe221b61 100644
--- a/src/input/frontend/qanalogaxisinput.h
+++ b/src/input/frontend/qanalogaxisinput.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAnalogAxisInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index 92abd9c0d..a6d0b3b1f 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -67,11 +67,11 @@ Q_SIGNALS:
     void valueChanged(float value);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAxis)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h
index b31f57a48..633713bb9 100644
--- a/src/input/frontend/qaxisaccumulator.h
+++ b/src/input/frontend/qaxisaccumulator.h
@@ -88,11 +88,11 @@ Q_SIGNALS:
     void scaleChanged(float scale);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QAxisAccumulator)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index b3d244e15..196dec735 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAxisSetting)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h
index 3e9aacc00..38223b6bf 100644
--- a/src/input/frontend/qbuttonaxisinput.h
+++ b/src/input/frontend/qbuttonaxisinput.h
@@ -83,7 +83,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QButtonAxisInput)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h
index bc35256b6..90781d297 100644
--- a/src/input/frontend/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
@@ -62,10 +62,10 @@ public:
     QStringList availablePhysicalDevices() const;
 
 private:
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override;
 
-    void onRegistered() Q_DECL_OVERRIDE;
-    void onUnregistered() Q_DECL_OVERRIDE;
+    void onRegistered() override;
+    void onUnregistered() override;
 
     Q_DECLARE_PRIVATE(QInputAspect)
     explicit QInputAspect(QInputAspectPrivate &dd, QObject *parent);
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index 1fc69bd1b..cfc5806d7 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -74,7 +74,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputChord)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index 6e08bc649..acdad12d2 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -78,7 +78,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputSequence)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
index 4f4d746f6..10f25d6ee 100644
--- a/src/input/frontend/qinputsettings.h
+++ b/src/input/frontend/qinputsettings.h
@@ -67,7 +67,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QInputSettings)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
     void eventSourceDestroyed();
 };
 
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index a0baf255e..615fb79b9 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -71,7 +71,7 @@ public:
 
 protected:
     explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 Q_SIGNALS:
     void activeInputChanged(QKeyboardHandler *activeInput);
diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h
index ba1959bfe..02b4fe1db 100644
--- a/src/input/frontend/qkeyboardhandler.h
+++ b/src/input/frontend/qkeyboardhandler.h
@@ -116,11 +116,11 @@ Q_SIGNALS:
     void released(Qt3DInput::QKeyEvent *event);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QKeyboardHandler)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index f60cfe2b1..4b32a0c90 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -68,7 +68,7 @@ public:
 
 private:
     Q_DECLARE_PRIVATE(QLogicalDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DInput
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 93ee99256..1e41843b9 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -85,11 +85,11 @@ Q_SIGNALS:
     void sensitivityChanged(float value);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QMouseDevice)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h
index ef4267c5c..50f7b028a 100644
--- a/src/input/frontend/qmousehandler.h
+++ b/src/input/frontend/qmousehandler.h
@@ -87,12 +87,12 @@ Q_SIGNALS:
 #endif
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
     void setContainsMouse(bool contains);
 
 private:
     Q_DECLARE_PRIVATE(QMouseHandler)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DInput
diff --git a/src/logic/callbackjob_p.h b/src/logic/callbackjob_p.h
index 3aed3447f..2dabc77f7 100644
--- a/src/logic/callbackjob_p.h
+++ b/src/logic/callbackjob_p.h
@@ -66,7 +66,7 @@ public:
     CallbackJob();
     void setManager(Manager *manager);
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Manager *m_logicManager;
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index 7b1fad788..beae32f96 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -71,7 +71,7 @@ public:
     Manager *logicManager() const { return m_logicManager; }
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
@@ -85,9 +85,9 @@ class HandlerFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit HandlerFunctor(Manager *handler);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     Manager *m_manager;
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index e73e2eb2d..958c0ce82 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -57,9 +57,9 @@ public:
     ~QLogicAspect();
 
 private:
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
-    void onRegistered() Q_DECL_OVERRIDE;
-    void onEngineStartup() Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override;
+    void onRegistered() override;
+    void onEngineStartup() override;
 
     Q_DECLARE_PRIVATE(QLogicAspect)
     explicit QLogicAspect(QLogicAspectPrivate &dd, QObject *parent);
diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h
index ee7131a3e..2a6a7259a 100644
--- a/src/logic/qlogicaspect_p.h
+++ b/src/logic/qlogicaspect_p.h
@@ -71,7 +71,7 @@ class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 
     Q_DECLARE_PUBLIC(QLogicAspect)
 
-    void onEngineAboutToShutdown() Q_DECL_OVERRIDE;
+    void onEngineAboutToShutdown() override;
     void registerBackendTypes();
 
     qint64 m_time;
diff --git a/src/plugins/geometryloaders/default/basegeometryloader_p.h b/src/plugins/geometryloaders/default/basegeometryloader_p.h
index fb1ffc6b0..0fe1e2763 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader_p.h
+++ b/src/plugins/geometryloaders/default/basegeometryloader_p.h
@@ -96,9 +96,9 @@ public:
     QVector<QVector4D> tangents() const { return m_tangents; }
     QVector<unsigned int> indices() const { return m_indices; }
 
-    QGeometry *geometry() const Q_DECL_OVERRIDE;
+    QGeometry *geometry() const override;
 
-    bool load(QIODevice *ioDev, const QString &subMesh = QString()) Q_DECL_OVERRIDE;
+    bool load(QIODevice *ioDev, const QString &subMesh = QString()) override;
 
 protected:
     virtual bool doLoad(QIODevice *ioDev, const QString &subMesh = QString()) = 0;
diff --git a/src/plugins/geometryloaders/default/main.cpp b/src/plugins/geometryloaders/default/main.cpp
index 5e7f69f38..ee603821b 100644
--- a/src/plugins/geometryloaders/default/main.cpp
+++ b/src/plugins/geometryloaders/default/main.cpp
@@ -51,14 +51,14 @@ class DefaultGeometryLoaderPlugin : public Qt3DRender::QGeometryLoaderFactory
     Q_PLUGIN_METADATA(IID QGeometryLoaderFactory_iid FILE "default.json")
 public:
 
-    QStringList keys() const Q_DECL_OVERRIDE
+    QStringList keys() const override
     {
         return QStringList() << OBJGEOMETRYLOADER_EXT
                              << PLYGEOMETRYLOADER_EXT
                              << STLGEOMETRYLOADER_EXT;
     }
 
-    Qt3DRender::QGeometryLoaderInterface *create(const QString &ext) Q_DECL_OVERRIDE
+    Qt3DRender::QGeometryLoaderInterface *create(const QString &ext) override
     {
         if (ext.compare(OBJGEOMETRYLOADER_EXT, Qt::CaseInsensitive) == 0)
             return new Qt3DRender::ObjGeometryLoader;
diff --git a/src/plugins/geometryloaders/default/plygeometryloader.cpp b/src/plugins/geometryloaders/default/plygeometryloader.cpp
index a51c991af..8564b0423 100644
--- a/src/plugins/geometryloaders/default/plygeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/plygeometryloader.cpp
@@ -66,14 +66,14 @@ public:
         : m_stream(ioDev)
     { }
 
-    int readIntValue(PlyGeometryLoader::DataType) Q_DECL_OVERRIDE
+    int readIntValue(PlyGeometryLoader::DataType) override
     {
         int value;
         m_stream >> value;
         return value;
     }
 
-    float readFloatValue(PlyGeometryLoader::DataType) Q_DECL_OVERRIDE
+    float readFloatValue(PlyGeometryLoader::DataType) override
     {
         float value;
         m_stream >> value;
@@ -94,12 +94,12 @@ public:
         m_stream.setByteOrder(byteOrder);
     }
 
-    int readIntValue(PlyGeometryLoader::DataType type) Q_DECL_OVERRIDE
+    int readIntValue(PlyGeometryLoader::DataType type) override
     {
         return readValue<int>(type);
     }
 
-    float readFloatValue(PlyGeometryLoader::DataType type) Q_DECL_OVERRIDE
+    float readFloatValue(PlyGeometryLoader::DataType type) override
     {
         return readValue<float>(type);
     }
diff --git a/src/plugins/geometryloaders/fbx/main.cpp b/src/plugins/geometryloaders/fbx/main.cpp
index a3bcb3b2a..fd0a61293 100644
--- a/src/plugins/geometryloaders/fbx/main.cpp
+++ b/src/plugins/geometryloaders/fbx/main.cpp
@@ -49,12 +49,12 @@ class FBXGeometryLoaderPlugin : public Qt3DRender::QGeometryLoaderFactory
     Q_PLUGIN_METADATA(IID QGeometryLoaderFactory_iid FILE "fbx.json")
 public:
 
-    QStringList keys() const Q_DECL_OVERRIDE
+    QStringList keys() const override
     {
         return QStringList() << FBXGEOMETRYLOADER_EXT;
     }
 
-    Qt3DRender::QGeometryLoaderInterface* create(const QString& ext) Q_DECL_OVERRIDE
+    Qt3DRender::QGeometryLoaderInterface* create(const QString& ext) override
     {
         if ((ext.compare(FBXGEOMETRYLOADER_EXT, Qt::CaseInsensitive) == 0))
             return new Qt3DRender::FbxGeometryLoader;
diff --git a/src/plugins/geometryloaders/gltf/main.cpp b/src/plugins/geometryloaders/gltf/main.cpp
index 71289368a..ee27e1325 100644
--- a/src/plugins/geometryloaders/gltf/main.cpp
+++ b/src/plugins/geometryloaders/gltf/main.cpp
@@ -49,14 +49,14 @@ class GLTFGeometryLoaderPlugin : public Qt3DRender::QGeometryLoaderFactory
     Q_PLUGIN_METADATA(IID QGeometryLoaderFactory_iid FILE "gltf.json")
 public:
 
-    QStringList keys() const Q_DECL_OVERRIDE
+    QStringList keys() const override
     {
         return QStringList() << GLTFGEOMETRYLOADER_EXT
                              << JSONGEOMETRYLOADER_EXT
                              << QGLTFGEOMETRYLOADER_EXT;
     }
 
-    Qt3DRender::QGeometryLoaderInterface *create(const QString &ext) Q_DECL_OVERRIDE
+    Qt3DRender::QGeometryLoaderInterface *create(const QString &ext) override
     {
         if ((ext.compare(GLTFGEOMETRYLOADER_EXT, Qt::CaseInsensitive) == 0) ||
             (ext.compare(JSONGEOMETRYLOADER_EXT, Qt::CaseInsensitive) == 0) ||
diff --git a/src/plugins/renderplugins/scene2d/main.cpp b/src/plugins/renderplugins/scene2d/main.cpp
index 00a3db734..a3392e55c 100644
--- a/src/plugins/renderplugins/scene2d/main.cpp
+++ b/src/plugins/renderplugins/scene2d/main.cpp
@@ -50,7 +50,7 @@ class Scene2DPlugin : public Qt3DRender::Render::QRenderPluginFactoryIf
     Q_PLUGIN_METADATA(IID QRenderPluginFactoryInterface_iid FILE "scene2dplugin.json")
 
     Qt3DRender::Render::QRenderPlugin *create(const QString &key,
-                                              const QStringList &paramList) Q_DECL_OVERRIDE
+                                              const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/plugins/renderplugins/scene2d/scene2dplugin.h b/src/plugins/renderplugins/scene2d/scene2dplugin.h
index 3b4471d55..1a5d84492 100644
--- a/src/plugins/renderplugins/scene2d/scene2dplugin.h
+++ b/src/plugins/renderplugins/scene2d/scene2dplugin.h
@@ -77,8 +77,8 @@ class Scene2DPlugin : public QRenderPlugin
 public:
     Scene2DPlugin();
     ~Scene2DPlugin();
-    bool registerBackendTypes(QRenderAspect *aspect, AbstractRenderer *renderer) Q_DECL_OVERRIDE;
-    bool unregisterBackendTypes(QRenderAspect *aspect) Q_DECL_OVERRIDE;
+    bool registerBackendTypes(QRenderAspect *aspect, AbstractRenderer *renderer) override;
+    bool unregisterBackendTypes(QRenderAspect *aspect) override;
 private:
     Render::Scene2DNodeManager *m_scene2dNodeManager;
 };
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.h b/src/plugins/sceneparsers/assimp/assimphelpers.h
index 64a6d4abe..0db22ce7b 100644
--- a/src/plugins/sceneparsers/assimp/assimphelpers.h
+++ b/src/plugins/sceneparsers/assimp/assimphelpers.h
@@ -69,12 +69,12 @@ public :
     AssimpIOStream(QIODevice *device);
     ~AssimpIOStream();
 
-    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) Q_DECL_OVERRIDE;
-    size_t Tell() const Q_DECL_OVERRIDE;
-    size_t FileSize() const Q_DECL_OVERRIDE;
-    void Flush() Q_DECL_OVERRIDE;
+    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override;
+    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) override;
+    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) override;
+    size_t Tell() const override;
+    size_t FileSize() const override;
+    void Flush() override;
 
 private:
     QIODevice *const m_device;
@@ -86,10 +86,10 @@ class AssimpIOSystem : public Assimp::IOSystem
 public :
     AssimpIOSystem();
     ~AssimpIOSystem();
-    bool Exists(const char *pFile) const Q_DECL_OVERRIDE;
-    char getOsSeparator() const Q_DECL_OVERRIDE;
-    Assimp::IOStream *Open(const char *pFile, const char *pMode) Q_DECL_OVERRIDE;
-    void Close(Assimp::IOStream *pFile) Q_DECL_OVERRIDE;
+    bool Exists(const char *pFile) const override;
+    char getOsSeparator() const override;
+    Assimp::IOStream *Open(const char *pFile, const char *pMode) override;
+    void Close(Assimp::IOStream *pFile) override;
 
 private:
     QMap<QByteArray, QIODevice::OpenMode> m_openModeMaps;
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h
index 068f6eed2..5cbace362 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.h
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.h
@@ -97,11 +97,11 @@ public:
     ~AssimpImporter();
 
     // SceneParserInterface interface
-    void setSource(const QUrl& source) Q_DECL_OVERRIDE;
-    void setData(const QByteArray& data, const QString &basePath) Q_DECL_OVERRIDE;
-    bool areFileTypesSupported(const QStringList &extensions) const Q_DECL_OVERRIDE;
-    Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
-    Qt3DCore::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
+    void setSource(const QUrl& source) override;
+    void setData(const QByteArray& data, const QString &basePath) override;
+    bool areFileTypesSupported(const QStringList &extensions) const override;
+    Qt3DCore::QEntity *scene(const QString &id = QString()) override;
+    Qt3DCore::QEntity *node(const QString &id) override;
 
 private:
     static bool areAssimpExtensions(const QStringList &extensions);
diff --git a/src/plugins/sceneparsers/assimp/main.cpp b/src/plugins/sceneparsers/assimp/main.cpp
index 079bf9b9b..445a44d16 100644
--- a/src/plugins/sceneparsers/assimp/main.cpp
+++ b/src/plugins/sceneparsers/assimp/main.cpp
@@ -48,7 +48,7 @@ class AssimpSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneImportFactoryInterface_iid FILE "assimp.json")
 
-    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/plugins/sceneparsers/gltf/main.cpp b/src/plugins/sceneparsers/gltf/main.cpp
index f595c26ab..d113b2efb 100644
--- a/src/plugins/sceneparsers/gltf/main.cpp
+++ b/src/plugins/sceneparsers/gltf/main.cpp
@@ -49,7 +49,7 @@ class GLTFSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneImportFactoryInterface_iid FILE "gltf.json")
 
-    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/plugins/sceneparsers/gltfexport/main.cpp b/src/plugins/sceneparsers/gltfexport/main.cpp
index f32aabe11..7a74d4d01 100644
--- a/src/plugins/sceneparsers/gltfexport/main.cpp
+++ b/src/plugins/sceneparsers/gltfexport/main.cpp
@@ -48,7 +48,7 @@ class GLTFSceneExportPlugin : public Qt3DRender::QSceneExportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneExportFactoryInterface_iid FILE "gltfexport.json")
 
-    Qt3DRender::QSceneExporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneExporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.h b/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
index a7158750b..3800194ce 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DAnimationPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 public:
     Qt3DQuick3DAnimationPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
index b0ef5947c..99c6ab525 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
@@ -58,7 +58,7 @@ class Qt3DQuick3DCorePlugin : public QQmlExtensionPlugin
 public:
     Qt3DQuick3DCorePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
     ~Qt3DQuick3DCorePlugin();
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
index f24a93b3f..b7c1f5f87 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
@@ -58,7 +58,7 @@ class Qt3DQuick3DExtrasPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DExtrasPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.h b/src/quick3d/imports/input/qt3dquick3dinputplugin.h
index 8a54eaa53..e02710696 100644
--- a/src/quick3d/imports/input/qt3dquick3dinputplugin.h
+++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DInputPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DInputPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
index a0d95c597..8f4a2fe39 100644
--- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
+++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DLogicPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DLogicPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
index 181965fe1..11802b179 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.h
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DRenderPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
index c9318673f..7e97fd662 100644
--- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
+++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
@@ -54,7 +54,7 @@ class QtQuickScene2DPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     QtQuickScene2DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
index df85b4cd7..44a69a805 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
@@ -57,7 +57,7 @@ class QtQuickScene3DPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     QtQuickScene3DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index e0ce3addc..39e679961 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -115,11 +115,11 @@ private Q_SLOTS:
     void applyRootEntityChange();
 
 private:
-    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE;
+    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) override;
     void setWindowSurface(QObject *rootObject);
     void setCameraAspectModeHelper();
     void updateCameraAspectRatio();
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *event) override;
 
     QStringList m_aspects;
     Qt3DCore::QEntity *m_entity;
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index a79cb4f90..b92c98133 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -99,8 +99,8 @@ public:
     QObject *object() const;
     Q_INVOKABLE QObject *objectAt(int index) const;
 
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
 Q_SIGNALS:
     void modelChanged();
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp
index 0ce0b8194..cef480240 100644
--- a/src/quick3d/quick3d/qt3dquick_global.cpp
+++ b/src/quick3d/quick3d/qt3dquick_global.cpp
@@ -286,7 +286,7 @@ public:
         return QMatrix4x4(matVals);
     }
 
-    const QMetaObject *getMetaObjectForMetaType(int type) Q_DECL_OVERRIDE
+    const QMetaObject *getMetaObjectForMetaType(int type) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -308,7 +308,7 @@ public:
         return nullptr;
     }
 
-    bool init(int type, QVariant& dst) Q_DECL_OVERRIDE
+    bool init(int type, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -335,7 +335,7 @@ public:
         return false;
     }
 
-    bool create(int type, int argc, const void *argv[], QVariant *v) Q_DECL_OVERRIDE
+    bool create(int type, int argc, const void *argv[], QVariant *v) override
     {
         switch (type) {
         case QMetaType::QVector2D:
@@ -400,7 +400,7 @@ public:
         return true;
     }
 
-    bool createFromString(int type, const QString &s, void *data, size_t dataSize) Q_DECL_OVERRIDE
+    bool createFromString(int type, const QString &s, void *data, size_t dataSize) override
     {
         bool ok = false;
 
@@ -423,7 +423,7 @@ public:
         return false;
     }
 
-    bool createStringFrom(int type, const void *data, QString *s) Q_DECL_OVERRIDE
+    bool createStringFrom(int type, const void *data, QString *s) override
     {
         if (type == QMetaType::QColor) {
             const QColor *color = reinterpret_cast<const QColor *>(data);
@@ -434,7 +434,7 @@ public:
         return false;
     }
 
-    bool variantFromString(const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(const QString &s, QVariant *v) override
     {
         QColor c(s);
         if (c.isValid()) {
@@ -477,7 +477,7 @@ public:
         return false;
     }
 
-    bool variantFromString(int type, const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(int type, const QString &s, QVariant *v) override
     {
         bool ok = false;
 
@@ -520,7 +520,7 @@ public:
         return false;
     }
 
-    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) override
     {
         QV4::Scope scope(v4);
 #ifndef QT_NO_DEBUG
@@ -543,7 +543,7 @@ public:
         return (*(reinterpret_cast<const T *>(lhs)) == rhs.value<T>());
     }
 
-    bool equal(int type, const void *lhs, const QVariant &rhs) Q_DECL_OVERRIDE
+    bool equal(int type, const void *lhs, const QVariant &rhs) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -574,7 +574,7 @@ public:
         return true;
     }
 
-    bool store(int type, const void *src, void *dst, size_t dstSize) Q_DECL_OVERRIDE
+    bool store(int type, const void *src, void *dst, size_t dstSize) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -604,7 +604,7 @@ public:
         return true;
     }
 
-    bool read(const QVariant &src, void *dst, int dstType) Q_DECL_OVERRIDE
+    bool read(const QVariant &src, void *dst, int dstType) override
     {
         switch (dstType) {
         case QMetaType::QColor:
@@ -636,7 +636,7 @@ public:
         return false;
     }
 
-    bool write(int type, const void *src, QVariant& dst) Q_DECL_OVERRIDE
+    bool write(int type, const void *src, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
index a6029cb37..e363ca205 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h
+++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DCore {
 class QuickNodeFactory : public QAbstractNodeFactory
 {
 public:
-    QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
index ca10c874f..a4efd0347 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
+++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DAnimation {
 class QuickAnimationNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
index 43172952c..a40d73a62 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DExtras {
 class QuickExtrasNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index e41754f42..560247ae9 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -86,7 +86,7 @@ public:
         startTimer(QGuiApplication::primaryScreen()->refreshRate());
     }
 
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE
+    void timerEvent(QTimerEvent *) override
     {
         incubateFor(m_incubationTime);
     }
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h
index 0880fc160..30f901979 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.h
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.h
@@ -114,7 +114,7 @@ Q_SIGNALS:
     void cameraAspectRatioModeChanged(CameraAspectRatioMode mode);
 
 protected:
-    void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *e) override;
 
 private:
     void onSceneCreated(QObject *rootObject);
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
index e9d28dafe..c50b4e4bc 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DInput {
 class QuickInputNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
index 2e680b852..0590338cc 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
@@ -70,7 +70,7 @@ public:
 
     Q_DECLARE_PUBLIC(Quick3DParameter)
 
-    void setValue(const QVariant &value) Q_DECL_OVERRIDE;
+    void setValue(const QVariant &value) override;
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index cd6e2a81e..539391da9 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE
+    QVariant readProperty(const QVariant &v) override
     {
         // qjsValueTypeId are not compile time constant (no switch)
         if (v.userType() == qjsValueTypeId) {
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index dd3788878..121c64216 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
 class QuickRenderNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h
index 73322a9e9..fd8466e22 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d.h
+++ b/src/quick3d/quick3dscene2d/items/qscene2d.h
@@ -101,7 +101,7 @@ protected:
     Q_DECLARE_PRIVATE(QScene2D)
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d_p.h b/src/quick3d/quick3dscene2d/items/qscene2d_p.h
index 217058f5c..ce354845a 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d_p.h
+++ b/src/quick3d/quick3dscene2d/items/qscene2d_p.h
@@ -74,7 +74,7 @@ public:
     QScene2DPrivate();
     ~QScene2DPrivate();
 
-    void setScene(Qt3DCore::QScene *scene) Q_DECL_OVERRIDE;
+    void setScene(Qt3DCore::QScene *scene) override;
 
     Scene2DManager *m_renderManager;
     QMetaObject::Connection m_textureDestroyedConnection;
diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h
index b42089306..454a09447 100644
--- a/src/quick3d/quick3dscene2d/items/scene2d_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h
@@ -75,7 +75,7 @@ class RenderQmlEventHandler : public QObject
     Q_OBJECT
 public:
     RenderQmlEventHandler(Scene2D *node);
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
 
 private:
     Scene2D *m_node;
@@ -94,8 +94,8 @@ public:
     void setOutput(Qt3DCore::QNodeId outputId);
     void initializeSharedObject();
 
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     bool updateFbo(QOpenGLTexture *texture);
     void syncRenderControl();
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
index 20c080dec..8829715d7 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
@@ -54,7 +54,7 @@ class RenderControl : public QQuickRenderControl
 {
 public:
     RenderControl(QWindow *w) : m_window(w) { }
-    QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE;
+    QWindow *renderWindow(QPoint *offset) override;
 
 private:
     QWindow *m_window;
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h b/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
index 821616f47..ececf96fd 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
@@ -99,7 +99,7 @@ public:
 
     void setItem(QQuickItem *item);
 
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
 
     void cleanup();
 };
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
index 9166c6ec2..dd8d1271b 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
 class QuickScene2DNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h
index d071619d8..7db0e1e93 100644
--- a/src/render/backend/cameralens_p.h
+++ b/src/render/backend/cameralens_p.h
@@ -70,9 +70,9 @@ class CameraLensFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit CameraLensFunctor(AbstractRenderer *renderer, QRenderAspect *renderAspect);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     CameraManager *m_manager;
@@ -95,7 +95,7 @@ public:
     void setExposure(float exposure);
     inline float exposure() const { return m_exposure; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void notifySceneBoundingVolume(const Sphere &sphere, Qt3DCore::QNodeCommand::CommandId commandId);
 
     static bool viewMatrixForCamera(EntityManager *manager, Qt3DCore::QNodeId cameraId,
diff --git a/src/render/backend/commandthread_p.h b/src/render/backend/commandthread_p.h
index 1955d13ac..a87d13a2e 100644
--- a/src/render/backend/commandthread_p.h
+++ b/src/render/backend/commandthread_p.h
@@ -85,7 +85,7 @@ public:
     void executeCommand(Command *command);
 
 private:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
     Q_INVOKABLE void executeCommandInternal(Command *command);
 
 private:
diff --git a/src/render/backend/computecommand_p.h b/src/render/backend/computecommand_p.h
index 9ce0e0975..fb8ca39ff 100644
--- a/src/render/backend/computecommand_p.h
+++ b/src/render/backend/computecommand_p.h
@@ -68,14 +68,14 @@ public:
     ~ComputeCommand();
 
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
     inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
     inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
     int m_workGroups[3];
 };
 
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index 52ad85281..c3d0e9bd0 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -89,7 +89,7 @@ public:
 
     void setParentHandle(HEntity parentHandle);
     void setNodeManagers(NodeManagers *manager);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void dump() const;
 
@@ -300,9 +300,9 @@ class RenderEntityFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit RenderEntityFunctor(AbstractRenderer *renderer, NodeManagers *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     NodeManagers *m_nodeManagers;
diff --git a/src/render/backend/platformsurfacefilter_p.h b/src/render/backend/platformsurfacefilter_p.h
index dbdc07b01..425ef303e 100644
--- a/src/render/backend/platformsurfacefilter_p.h
+++ b/src/render/backend/platformsurfacefilter_p.h
@@ -75,7 +75,7 @@ public:
     explicit PlatformSurfaceFilter(QObject *parent = 0);
     ~PlatformSurfaceFilter();
 
-    bool eventFilter(QObject *obj, QEvent *e) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *obj, QEvent *e) override;
 
     static void lockSurface();
     static void releaseSurface();
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 3cf99ec81..b111a6310 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -151,46 +151,46 @@ public:
     explicit Renderer(QRenderAspect::RenderType type);
     ~Renderer();
 
-    void dumpInfo() const Q_DECL_OVERRIDE;
-    API api() const Q_DECL_OVERRIDE { return AbstractRenderer::OpenGL; }
+    void dumpInfo() const override;
+    API api() const override { return AbstractRenderer::OpenGL; }
 
-    qint64 time() const Q_DECL_OVERRIDE;
-    void setTime(qint64 time) Q_DECL_OVERRIDE;
+    qint64 time() const override;
+    void setTime(qint64 time) override;
 
-    void setNodeManagers(NodeManagers *managers) Q_DECL_OVERRIDE;
-    void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE;
-    void setSurfaceExposed(bool exposed) Q_DECL_OVERRIDE;
+    void setNodeManagers(NodeManagers *managers) override;
+    void setServices(Qt3DCore::QServiceLocator *services) override;
+    void setSurfaceExposed(bool exposed) override;
 
-    NodeManagers *nodeManagers() const Q_DECL_OVERRIDE;
-    Qt3DCore::QServiceLocator *services() const Q_DECL_OVERRIDE { return m_services; }
+    NodeManagers *nodeManagers() const override;
+    Qt3DCore::QServiceLocator *services() const override { return m_services; }
 
-    void initialize() Q_DECL_OVERRIDE;
-    void shutdown() Q_DECL_OVERRIDE;
-    void releaseGraphicsResources() Q_DECL_OVERRIDE;
+    void initialize() override;
+    void shutdown() override;
+    void releaseGraphicsResources() override;
 
-    void render() Q_DECL_OVERRIDE;
-    void doRender() Q_DECL_OVERRIDE;
-    void cleanGraphicsResources() Q_DECL_OVERRIDE;
+    void render() override;
+    void doRender() override;
+    void cleanGraphicsResources() override;
 
-    bool isRunning() const Q_DECL_OVERRIDE { return m_running.load(); }
+    bool isRunning() const override { return m_running.load(); }
 
-    void setSceneRoot(Qt3DCore::QBackendNodeFactory *factory, Entity *sgRoot) Q_DECL_OVERRIDE;
-    Entity *sceneRoot() const Q_DECL_OVERRIDE { return m_renderSceneRoot; }
+    void setSceneRoot(Qt3DCore::QBackendNodeFactory *factory, Entity *sgRoot) override;
+    Entity *sceneRoot() const override { return m_renderSceneRoot; }
 
-    FrameGraphNode *frameGraphRoot() const Q_DECL_OVERRIDE;
+    FrameGraphNode *frameGraphRoot() const override;
 
-    void markDirty(BackendNodeDirtySet changes, BackendNode *node) Q_DECL_OVERRIDE;
-    BackendNodeDirtySet dirtyBits() Q_DECL_OVERRIDE;
-    void clearDirtyBits(BackendNodeDirtySet changes) Q_DECL_OVERRIDE;
+    void markDirty(BackendNodeDirtySet changes, BackendNode *node) override;
+    BackendNodeDirtySet dirtyBits() override;
+    void clearDirtyBits(BackendNodeDirtySet changes) override;
 
 
-    bool shouldRender() Q_DECL_OVERRIDE;
-    void skipNextFrame() Q_DECL_OVERRIDE;
+    bool shouldRender() override;
+    void skipNextFrame() override;
 
-    QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() Q_DECL_OVERRIDE;
-    Qt3DCore::QAspectJobPtr pickBoundingVolumeJob() Q_DECL_OVERRIDE;
-    Qt3DCore::QAspectJobPtr syncTextureLoadingJob() Q_DECL_OVERRIDE;
-    Qt3DCore::QAspectJobPtr expandBoundingVolumeJob() Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() override;
+    Qt3DCore::QAspectJobPtr pickBoundingVolumeJob() override;
+    Qt3DCore::QAspectJobPtr syncTextureLoadingJob() override;
+    Qt3DCore::QAspectJobPtr expandBoundingVolumeJob() override;
 
     QVector<Qt3DCore::QAspectJobPtr> createRenderBufferJobs() const;
 
@@ -206,13 +206,13 @@ public:
     inline SynchronizerJobPtr textureLoadSyncJob() const { return m_syncTextureLoadingJob; }
     inline UpdateSkinningPaletteJobPtr updateSkinningPaletteJob() const { return m_updateSkinningPaletteJob; }
 
-    Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const Q_DECL_OVERRIDE;
+    Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const override;
 
-    void registerEventFilter(Qt3DCore::QEventFilterService *service) Q_DECL_OVERRIDE;
+    void registerEventFilter(Qt3DCore::QEventFilterService *service) override;
 
-    virtual void setSettings(RenderSettings *settings) Q_DECL_OVERRIDE;
-    virtual RenderSettings *settings() const Q_DECL_OVERRIDE;
-    QOpenGLContext *shareContext() const Q_DECL_OVERRIDE;
+    void setSettings(RenderSettings *settings) override;
+    RenderSettings *settings() const override;
+    QOpenGLContext *shareContext() const override;
 
     void updateGLResources();
     void updateTexture(Texture *texture);
@@ -249,9 +249,9 @@ public:
     void enqueueRenderView(RenderView *renderView, int submitOrder);
     bool isReadyToSubmit();
 
-    QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE;
-    void setOffscreenSurfaceHelper(OffscreenSurfaceHelper *helper) Q_DECL_OVERRIDE;
-    QSurfaceFormat format() Q_DECL_OVERRIDE;
+    QVariant executeCommand(const QStringList &args) override;
+    void setOffscreenSurfaceHelper(OffscreenSurfaceHelper *helper) override;
+    QSurfaceFormat format() override;
 
     struct ViewSubmissionResultData
     {
diff --git a/src/render/backend/rendersettings_p.h b/src/render/backend/rendersettings_p.h
index 960edee29..381a07429 100644
--- a/src/render/backend/rendersettings_p.h
+++ b/src/render/backend/rendersettings_p.h
@@ -67,7 +67,7 @@ class Q_AUTOTEST_EXPORT RenderSettings : public BackendNode
 public:
     RenderSettings();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     Qt3DCore::QNodeId activeFrameGraphID() const { return m_activeFrameGraph; }
     QRenderSettings::RenderPolicy renderPolicy() const { return m_renderPolicy; }
@@ -94,9 +94,9 @@ class RenderSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit RenderSettingsFunctor(AbstractRenderer *renderer);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     AbstractRenderer *m_renderer;
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index 2248edbdb..d81a8883e 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -76,7 +76,7 @@ public:
 
     QVector<Qt3DCore::QNodeId> renderOutputs() const;
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/backend/rendertargetoutput_p.h b/src/render/backend/rendertargetoutput_p.h
index b7867c2cb..fcd4f15e0 100644
--- a/src/render/backend/rendertargetoutput_p.h
+++ b/src/render/backend/rendertargetoutput_p.h
@@ -76,7 +76,7 @@ public:
     QString name() const;
     QAbstractTexture::CubeMapFace face() const;
     QRenderTargetOutput::AttachmentPoint point() const;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     Attachment *attachment();
     const Attachment *attachment() const;
 
diff --git a/src/render/backend/renderthread_p.h b/src/render/backend/renderthread_p.h
index 8d7c083ed..6bb0c7c35 100644
--- a/src/render/backend/renderthread_p.h
+++ b/src/render/backend/renderthread_p.h
@@ -75,7 +75,7 @@ public:
     Render::Renderer* renderer() const { return m_renderer; }
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Renderer* m_renderer;
diff --git a/src/render/backend/transform_p.h b/src/render/backend/transform_p.h
index 4b58e3cae..8334a5a24 100644
--- a/src/render/backend/transform_p.h
+++ b/src/render/backend/transform_p.h
@@ -76,7 +76,7 @@ public:
     QQuaternion rotation() const;
     QVector3D translation() const;
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void updateMatrix();
 
diff --git a/src/render/backend/trianglesextractor_p.h b/src/render/backend/trianglesextractor_p.h
index 8772d9a72..857c4c638 100644
--- a/src/render/backend/trianglesextractor_p.h
+++ b/src/render/backend/trianglesextractor_p.h
@@ -73,7 +73,7 @@ public:
 private:
     void visit(uint andx, const QVector3D &a,
                uint bndx, const QVector3D &b,
-               uint cndx, const QVector3D &c) Q_DECL_OVERRIDE;
+               uint cndx, const QVector3D &c) override;
 
     GeometryRenderer *m_renderer;
     QVector<RayCasting::QBoundingVolume *> m_volumes;
diff --git a/src/render/framegraph/blitframebuffer_p.h b/src/render/framegraph/blitframebuffer_p.h
index 64800d0fa..c78b20294 100644
--- a/src/render/framegraph/blitframebuffer_p.h
+++ b/src/render/framegraph/blitframebuffer_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT BlitFramebuffer : public FrameGraphNode
 public:
     BlitFramebuffer();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     Qt3DCore::QNodeId sourceRenderTargetId() const;
 
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index e20d0cf8e..4fc148316 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -69,7 +69,7 @@ class CameraSelector : public FrameGraphNode
 public:
     CameraSelector();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     Qt3DCore::QNodeId cameraUuid() const;
 
 private:
diff --git a/src/render/framegraph/clearbuffers_p.h b/src/render/framegraph/clearbuffers_p.h
index e25860b03..41bfaf89f 100644
--- a/src/render/framegraph/clearbuffers_p.h
+++ b/src/render/framegraph/clearbuffers_p.h
@@ -67,7 +67,7 @@ class ClearBuffers : public FrameGraphNode
 public:
     ClearBuffers();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     QClearBuffers::BufferType type() const;
     float clearDepthValue() const;
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 7f7cc6842..296b50468 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -68,7 +68,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
     inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
     inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 843ad63a0..19165f56f 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -118,11 +118,11 @@ public:
     FrameGraphNode *parent() const;
     QVector<FrameGraphNode *> children() const;
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 protected:
     FrameGraphNode(FrameGraphNodeType nodeType, QBackendNode::Mode mode = QBackendNode::ReadOnly);
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
 
 private:
     FrameGraphNodeType m_nodeType;
@@ -143,17 +143,17 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override
     {
         return createBackendFrameGraphNode(change);
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override
     {
         return m_manager->lookupNode(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE
+    void destroy(Qt3DCore::QNodeId id) const override
     {
         m_manager->releaseNode(id);
     }
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index 59e16c934..cf986e687 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -68,7 +68,7 @@ class LayerFilterNode : public FrameGraphNode
 public:
     LayerFilterNode();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     Qt3DCore::QNodeIdVector layerIds() const;
     void setLayerIds(const Qt3DCore::QNodeIdVector &list);
 
diff --git a/src/render/framegraph/memorybarrier_p.h b/src/render/framegraph/memorybarrier_p.h
index 66a3ae823..e396377e5 100644
--- a/src/render/framegraph/memorybarrier_p.h
+++ b/src/render/framegraph/memorybarrier_p.h
@@ -67,7 +67,7 @@ public:
     ~MemoryBarrier();
 
     QMemoryBarrier::Operations waitOperations() const;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/framegraph/proximityfilter_p.h b/src/render/framegraph/proximityfilter_p.h
index cfd6af805..11c9ec63a 100644
--- a/src/render/framegraph/proximityfilter_p.h
+++ b/src/render/framegraph/proximityfilter_p.h
@@ -64,7 +64,7 @@ class Q_AUTOTEST_EXPORT ProximityFilter : public FrameGraphNode
 public:
     ProximityFilter();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     float distanceThreshold() const { return m_distanceThreshold; }
     Qt3DCore::QNodeId entityId() const { return m_entityId; }
diff --git a/src/render/framegraph/qblitframebuffer.h b/src/render/framegraph/qblitframebuffer.h
index 75ce4c23a..809fb98a3 100644
--- a/src/render/framegraph/qblitframebuffer.h
+++ b/src/render/framegraph/qblitframebuffer.h
@@ -101,7 +101,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QBlitFramebuffer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 5cdd04028..9aff269ca 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -71,7 +71,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QCameraSelector)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h
index 91828c222..b03543e47 100644
--- a/src/render/framegraph/qclearbuffers.h
+++ b/src/render/framegraph/qclearbuffers.h
@@ -102,7 +102,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QClearBuffers)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qdispatchcompute.h b/src/render/framegraph/qdispatchcompute.h
index c5209b8c6..417796b61 100644
--- a/src/render/framegraph/qdispatchcompute.h
+++ b/src/render/framegraph/qdispatchcompute.h
@@ -75,7 +75,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QDispatchCompute)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h
index eb43708e1..e78625d0d 100644
--- a/src/render/framegraph/qframegraphnode.h
+++ b/src/render/framegraph/qframegraphnode.h
@@ -61,7 +61,7 @@ public:
 
 protected:
     explicit QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 
 private:
     Q_DECLARE_PRIVATE(QFrameGraphNode)
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index 68854c722..29a35b08e 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -83,7 +83,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QLayerFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qmemorybarrier.h b/src/render/framegraph/qmemorybarrier.h
index bb439a9a5..244b7ef53 100644
--- a/src/render/framegraph/qmemorybarrier.h
+++ b/src/render/framegraph/qmemorybarrier.h
@@ -89,7 +89,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QMemoryBarrier)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qproximityfilter.h b/src/render/framegraph/qproximityfilter.h
index 0fbe624a1..b101f6c09 100644
--- a/src/render/framegraph/qproximityfilter.h
+++ b/src/render/framegraph/qproximityfilter.h
@@ -74,7 +74,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QProximityFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendercapture.h b/src/render/framegraph/qrendercapture.h
index c18b16170..c0a4d4ab4 100644
--- a/src/render/framegraph/qrendercapture.h
+++ b/src/render/framegraph/qrendercapture.h
@@ -89,11 +89,11 @@ public:
     Q_REVISION(9) Q_INVOKABLE Qt3DRender::QRenderCaptureReply *requestCapture(const QRect &rect = QRect());
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QRenderCapture)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 934d0479b..9296517e8 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -74,7 +74,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderPassFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h
index 52efaf24e..3df86940b 100644
--- a/src/render/framegraph/qrenderstateset.h
+++ b/src/render/framegraph/qrenderstateset.h
@@ -66,7 +66,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderStateSet)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h
index eae221800..5d0273187 100644
--- a/src/render/framegraph/qrendersurfaceselector.h
+++ b/src/render/framegraph/qrendersurfaceselector.h
@@ -83,7 +83,7 @@ protected:
     explicit QRenderSurfaceSelector(QRenderSurfaceSelectorPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index 68fbe2666..5e8cd0761 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -76,7 +76,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderTargetSelector)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h
index e7583b094..d94ee3d69 100644
--- a/src/render/framegraph/qsortpolicy.h
+++ b/src/render/framegraph/qsortpolicy.h
@@ -80,7 +80,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QSortPolicy)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 59b297c7d..243b2d6ec 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -71,7 +71,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QTechniqueFilter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h
index 66a3428c5..47b4f3094 100644
--- a/src/render/framegraph/qviewport.h
+++ b/src/render/framegraph/qviewport.h
@@ -76,7 +76,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QViewport)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index ee9137b04..b42d20d58 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -76,7 +76,7 @@ public:
     QVector<Qt3DCore::QNodeId> parameters() const;
     void appendFilter(Qt3DCore::QNodeId criterionId);
     void removeFilter(Qt3DCore::QNodeId criterionId);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index 7a7547deb..030a6f64c 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -68,7 +68,7 @@ public:
     QSize renderTargetSize() const;
     void setRenderTargetSize(const QSize &size) { m_renderTargetSize = size; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     QSurface *surface() const { return m_surface; }
     inline int width() const Q_DECL_NOTHROW { return m_width; }
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 359a433ec..7cd4fb7e7 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -66,7 +66,7 @@ class RenderTargetSelector : public FrameGraphNode
 public:
     RenderTargetSelector();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     Qt3DCore::QNodeId renderTargetUuid() const { return m_renderTargetUuid; }
     QVector<QRenderTargetOutput::AttachmentPoint> outputs() const { return m_outputs; }
diff --git a/src/render/framegraph/sortpolicy_p.h b/src/render/framegraph/sortpolicy_p.h
index 868c1430d..02e922f0c 100644
--- a/src/render/framegraph/sortpolicy_p.h
+++ b/src/render/framegraph/sortpolicy_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT SortPolicy : public FrameGraphNode
 public:
     SortPolicy();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     QVector<Qt3DRender::QSortPolicy::SortType> sortTypes() const;
 
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 235fb69a2..9102c9a56 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -69,7 +69,7 @@ public:
     QVector<Qt3DCore::QNodeId> renderStates() const;
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void addRenderState(Qt3DCore::QNodeId renderStateId);
     void removeRenderState(Qt3DCore::QNodeId renderStateId);
 
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 091dc1cf7..a96a27049 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -79,7 +79,7 @@ public:
     QVector<Qt3DCore::QNodeId> parameters() const;
 
     QVector<Qt3DCore::QNodeId> filters() const;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index 18adc3f0c..1848677b6 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -84,7 +84,7 @@ public:
     float gamma() const;
     void setGamma(float gamma);
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h
index 95f6aee51..e28535041 100644
--- a/src/render/frontend/qabstractfunctor.h
+++ b/src/render/frontend/qabstractfunctor.h
@@ -68,7 +68,7 @@ qintptr functorTypeId()
 }
 
 #define QT3D_FUNCTOR(Class)                     \
-   qintptr id() const Q_DECL_OVERRIDE {         \
+   qintptr id() const override {         \
         return Qt3DRender::functorTypeId<Class>();    \
    }
 
diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h
index 0cd22e348..586e2022f 100644
--- a/src/render/frontend/qcameralens.h
+++ b/src/render/frontend/qcameralens.h
@@ -140,8 +140,8 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QCameraLens)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 };
 
 } // Qt3DRender
diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h
index 6bc31c6f6..c31082197 100644
--- a/src/render/frontend/qcomputecommand.h
+++ b/src/render/frontend/qcomputecommand.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QComputeCommand)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h
index 2e752d962..14ed92628 100644
--- a/src/render/frontend/qlevelofdetail.h
+++ b/src/render/frontend/qlevelofdetail.h
@@ -96,8 +96,8 @@ Q_SIGNALS:
 
 protected:
     explicit QLevelOfDetail(QLevelOfDetailPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QLevelOfDetail)
diff --git a/src/render/frontend/qlevelofdetailswitch.h b/src/render/frontend/qlevelofdetailswitch.h
index 6ab905171..55c7d24c1 100644
--- a/src/render/frontend/qlevelofdetailswitch.h
+++ b/src/render/frontend/qlevelofdetailswitch.h
@@ -56,7 +56,7 @@ public:
 
 protected:
     explicit QLevelOfDetailSwitch(QLevelOfDetailPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QLevelOfDetail)
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index 48ef5b164..bde60c9e2 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -83,14 +83,14 @@ protected:
     Q_DECLARE_PRIVATE(QRenderAspect)
 
 private:
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) override;
 
-    QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE;
+    QVariant executeCommand(const QStringList &args) override;
 
-    void onRegistered() Q_DECL_OVERRIDE;
-    void onUnregistered() Q_DECL_OVERRIDE;
+    void onRegistered() override;
+    void onUnregistered() override;
 
-    void onEngineStartup() Q_DECL_OVERRIDE;
+    void onEngineStartup() override;
 
     friend class Render::Renderer;
     friend class Render::QRenderPlugin;
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h
index db6ffb6d8..b759ebd88 100644
--- a/src/render/frontend/qrendersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -91,7 +91,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_onPickResultModeChanged(QPickingSettings::PickResultMode))
     Q_PRIVATE_SLOT(d_func(), void _q_onFaceOrientationPickingModeChanged(QPickingSettings::FaceOrientationPickingMode))
     Q_PRIVATE_SLOT(d_func(), void _q_onWorldSpaceToleranceChanged(float))
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3Drender
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index cb0edde51..69bed5aa5 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -66,7 +66,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderTarget)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/frontend/qrendertargetoutput.h b/src/render/frontend/qrendertargetoutput.h
index f2feea536..2eb99df3c 100644
--- a/src/render/frontend/qrendertargetoutput.h
+++ b/src/render/frontend/qrendertargetoutput.h
@@ -111,7 +111,7 @@ protected:
     explicit QRenderTargetOutput(QRenderTargetOutputPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
     Q_DECLARE_PRIVATE(QRenderTargetOutput)
 };
 
diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h
index 1587aecab..98398afad 100644
--- a/src/render/frontend/sphere_p.h
+++ b/src/render/frontend/sphere_p.h
@@ -80,12 +80,12 @@ public:
     {}
 
     void setCenter(const QVector3D &c);
-    QVector3D center() const Q_DECL_OVERRIDE;
+    QVector3D center() const override;
 
     inline bool isNull() { return m_center == QVector3D() && m_radius == 0.0f; }
 
     void setRadius(float r);
-    float radius() const Q_DECL_OVERRIDE;
+    float radius() const override;
 
     void clear();
     void initializeFromPoints(const QVector<QVector3D> &points);
diff --git a/src/render/geometry/armature_p.h b/src/render/geometry/armature_p.h
index f0960d256..3e2bd748a 100644
--- a/src/render/geometry/armature_p.h
+++ b/src/render/geometry/armature_p.h
@@ -63,7 +63,7 @@ class Q_AUTOTEST_EXPORT Armature : public BackendNode
 public:
     Armature();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void cleanup();
 
     Qt3DCore::QNodeId skeletonId() const { return m_skeletonId; }
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index 1b639f42f..bd395160a 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -68,7 +68,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 691d6cc60..ac5dc1437 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -73,7 +73,7 @@ public:
     ~Buffer();
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void setManager(BufferManager *manager);
     void executeFunctor();
@@ -107,9 +107,9 @@ class BufferFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit BufferFunctor(AbstractRenderer *renderer, BufferManager *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 private:
     BufferManager *m_manager;
     AbstractRenderer *m_renderer;
diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h
index 41d54cb54..ea1f7fdb2 100644
--- a/src/render/geometry/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
@@ -68,7 +68,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline QVector<Qt3DCore::QNodeId> attributes() const { return m_attributes; }
     inline bool isDirty() const { return m_geometryDirty; }
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 5a7358f00..146f49dc2 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -74,7 +74,7 @@ public:
 
     void cleanup();
     void setManager(GeometryRendererManager *manager);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void executeFunctor();
 
     inline Qt3DCore::QNodeId geometryId() const { return m_geometryId; }
@@ -121,9 +121,9 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit GeometryRendererFunctor(AbstractRenderer *renderer, GeometryRendererManager *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 private:
     GeometryRendererManager *m_manager;
     AbstractRenderer *m_renderer;
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index b3ce270a0..982a449fb 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -146,7 +146,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAttribute)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index b978e0e0b..3d524d60f 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -153,12 +153,12 @@ QBufferPrivate::QBufferPrivate()
             , m_radius(radius)
         {}
 
-        QByteArray operator ()() Q_DECL_OVERRIDE
+        QByteArray operator ()() override
         {
             return createSphereMeshVertexData(m_radius, m_rings, m_slices);
         }
 
-        bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+        bool operator ==(const QBufferDataGenerator &other) const override
         {
             const SphereVertexDataFunctor *otherFunctor = functor_cast<SphereVertexDataFunctor>(&other);
             if (otherFunctor != nullptr)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index 7cb5acb0a..1aa4bcc06 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -118,7 +118,7 @@ public Q_SLOTS:
     void setAccessType(AccessType access);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 Q_SIGNALS:
     void dataChanged(const QByteArray &bytes);
@@ -130,7 +130,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QBuffer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 143d98d1e..0e6f7d68e 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -75,7 +75,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QGeometry)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 704e2f89f..85bab9fc6 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -134,11 +134,11 @@ Q_SIGNALS:
 
 protected:
     explicit QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QGeometryRenderer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h
index 1f602ba89..e8eccb608 100644
--- a/src/render/geometry/qmesh_p.h
+++ b/src/render/geometry/qmesh_p.h
@@ -82,7 +82,7 @@ class Q_AUTOTEST_EXPORT MeshDownloadRequest : public Qt3DCore::QDownloadRequest
 public:
     MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Qt3DCore::QAspectEngine *engine);
 
-    void onCompleted() Q_DECL_OVERRIDE;
+    void onCompleted() override;
 
 private:
     Qt3DCore::QNodeId m_mesh;
@@ -93,8 +93,8 @@ class Q_AUTOTEST_EXPORT MeshLoaderFunctor : public QGeometryFactory
 {
 public :
     MeshLoaderFunctor(QMesh *mesh, Qt3DCore::QAspectEngine *engine, const QByteArray &sourceData = QByteArray());
-    QGeometry *operator()() Q_DECL_OVERRIDE;
-    bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE;
+    QGeometry *operator()() override;
+    bool operator ==(const QGeometryFactory &other) const override;
     QT3D_FUNCTOR(MeshLoaderFunctor)
 
     Qt3DCore::QNodeId m_mesh;
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index 8907987d9..b1567ab1b 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -84,7 +84,7 @@ public:
     JointManager *jointManager() const { return m_jointManager; }
 
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void setStatus(Qt3DCore::QSkeletonLoader::Status status);
     Qt3DCore::QSkeletonLoader::Status status() const { return m_status; }
 
diff --git a/src/render/graphicshelpers/graphicshelperes2_p.h b/src/render/graphicshelpers/graphicshelperes2_p.h
index eade3514a..1c6df41b6 100644
--- a/src/render/graphicshelpers/graphicshelperes2_p.h
+++ b/src/render/graphicshelpers/graphicshelperes2_p.h
@@ -69,95 +69,95 @@ public:
     virtual ~GraphicsHelperES2();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 protected:
     QOpenGLFunctions *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelperes3_p.h b/src/render/graphicshelpers/graphicshelperes3_p.h
index 84a906b49..7f78d0d7f 100644
--- a/src/render/graphicshelpers/graphicshelperes3_p.h
+++ b/src/render/graphicshelpers/graphicshelperes3_p.h
@@ -66,25 +66,25 @@ public:
     ~GraphicsHelperES3();
 
     // QGraphicHelperInterface interface
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    virtual void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    virtual void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    bool supportsFeature(Feature feature) const override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
 
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 protected:
     QOpenGLExtraFunctions *m_extraFuncs = Q_NULLPTR;
diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/graphicshelpers/graphicshelpergl2_p.h
index 1a7af544c..2db75004f 100644
--- a/src/render/graphicshelpers/graphicshelpergl2_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl2_p.h
@@ -69,95 +69,95 @@ public:
     GraphicsHelperGL2();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 private:
     QOpenGLFunctions_2_0 *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl3_2_p.h b/src/render/graphicshelpers/graphicshelpergl3_2_p.h
index adb2942aa..133295fd7 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_2_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_2_p.h
@@ -71,95 +71,95 @@ public:
     ~GraphicsHelperGL3_2();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 private:
     QOpenGLFunctions_3_2_Core *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
index d36386a73..0ecdd3620 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl3_3_p.h
@@ -71,95 +71,95 @@ public:
     ~GraphicsHelperGL3_3();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 private:
     QOpenGLFunctions_3_3_Core *m_funcs;
diff --git a/src/render/graphicshelpers/graphicshelpergl4_p.h b/src/render/graphicshelpers/graphicshelpergl4_p.h
index b38d0876c..3020b16d8 100644
--- a/src/render/graphicshelpers/graphicshelpergl4_p.h
+++ b/src/render/graphicshelpers/graphicshelpergl4_p.h
@@ -69,95 +69,95 @@ public:
     GraphicsHelperGL4();
 
     // QGraphicHelperInterface interface
-    void alphaTest(GLenum mode1, GLenum mode2) Q_DECL_OVERRIDE;
-    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) Q_DECL_OVERRIDE;
-    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) Q_DECL_OVERRIDE;
-    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) Q_DECL_OVERRIDE;
-    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) Q_DECL_OVERRIDE;
-    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) Q_DECL_OVERRIDE;
-    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) Q_DECL_OVERRIDE;
-    void blendEquation(GLenum mode) Q_DECL_OVERRIDE;
-    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) Q_DECL_OVERRIDE;
-    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) Q_DECL_OVERRIDE;
-    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) Q_DECL_OVERRIDE;
-    GLuint boundFrameBufferObject() Q_DECL_OVERRIDE;
-    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) Q_DECL_OVERRIDE;
-    bool checkFrameBufferComplete() Q_DECL_OVERRIDE;
-    void clearBufferf(GLint drawbuffer, const QVector4D &values) Q_DECL_OVERRIDE;
-    GLuint createFrameBufferObject() Q_DECL_OVERRIDE;
-    void depthMask(GLenum mode) Q_DECL_OVERRIDE;
-    void depthTest(GLenum mode) Q_DECL_OVERRIDE;
-    void disableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void disablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void disablePrimitiveRestart() Q_DECL_OVERRIDE;
-    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) Q_DECL_OVERRIDE;
-    char *mapBuffer(GLenum target, GLsizeiptr size) Q_DECL_OVERRIDE;
-    GLboolean unmapBuffer(GLenum target) Q_DECL_OVERRIDE;
-    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) Q_DECL_OVERRIDE;
-    void drawArraysIndirect(GLenum mode,void *indirect) Q_DECL_OVERRIDE;
-    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) Q_DECL_OVERRIDE;
-    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) Q_DECL_OVERRIDE;
-    void drawBuffers(GLsizei n, const int *bufs) Q_DECL_OVERRIDE;
-    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) Q_DECL_OVERRIDE;
-    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) Q_DECL_OVERRIDE;
-    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) Q_DECL_OVERRIDE;
-    void enableClipPlane(int clipPlane) Q_DECL_OVERRIDE;
-    void enablei(GLenum cap, GLuint index) Q_DECL_OVERRIDE;
-    void enablePrimitiveRestart(int primitiveRestartIndex) Q_DECL_OVERRIDE;
-    void enableVertexAttributeArray(int location) Q_DECL_OVERRIDE;
-    void frontFace(GLenum mode) Q_DECL_OVERRIDE;
-    QSize getRenderBufferDimensions(GLuint renderBufferId) Q_DECL_OVERRIDE;
-    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) Q_DECL_OVERRIDE;
-    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) Q_DECL_OVERRIDE;
-    void pointSize(bool programmable, GLfloat value) Q_DECL_OVERRIDE;
-    GLint maxClipPlaneCount() Q_DECL_OVERRIDE;
-    void memoryBarrier(QMemoryBarrier::Operations barriers) Q_DECL_OVERRIDE;
-    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) Q_DECL_OVERRIDE;
-    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) Q_DECL_OVERRIDE;
-    void releaseFrameBufferObject(GLuint frameBufferId) Q_DECL_OVERRIDE;
-    void setMSAAEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setAlphaCoverageEnabled(bool enable) Q_DECL_OVERRIDE;
-    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) Q_DECL_OVERRIDE;
-    void setSeamlessCubemap(bool enable) Q_DECL_OVERRIDE;
-    void setVerticesPerPatch(GLint verticesPerPatch) Q_DECL_OVERRIDE;
-    bool supportsFeature(Feature feature) const Q_DECL_OVERRIDE;
-    uint uniformByteSize(const ShaderUniform &description) Q_DECL_OVERRIDE;
-    void useProgram(GLuint programId) Q_DECL_OVERRIDE;
-    void vertexAttribDivisor(GLuint index, GLuint divisor) Q_DECL_OVERRIDE;
-    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) Q_DECL_OVERRIDE;
-    void readBuffer(GLenum mode) Q_DECL_OVERRIDE;
-    void drawBuffer(GLenum mode) Q_DECL_OVERRIDE;
-
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    void glUniform1iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform2iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform3iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-    void glUniform4iv(GLint location, GLsizei count, const GLint *value) Q_DECL_OVERRIDE;
-
-    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) Q_DECL_OVERRIDE;
-
-    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) Q_DECL_OVERRIDE;
-
-    UniformType uniformTypeFromGLType(GLenum glType) Q_DECL_OVERRIDE;
+    void alphaTest(GLenum mode1, GLenum mode2) override;
+    void bindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
+    void bindFragDataLocation(GLuint shader, const QHash<QString, int> &outputs) override;
+    bool frameBufferNeedsRenderBuffer(const Attachment &attachment) override;
+    void bindFrameBufferAttachment(QOpenGLTexture *texture, const Attachment &attachment) override;
+    void bindFrameBufferAttachment(RenderBuffer *renderBuffer, const Attachment &attachment) override;
+    void bindFrameBufferObject(GLuint frameBufferId, FBOBindMode mode) override;
+    void bindShaderStorageBlock(GLuint programId, GLuint shaderStorageBlockIndex, GLuint shaderStorageBlockBinding) override;
+    void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override;
+    void blendEquation(GLenum mode) override;
+    void blendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) override;
+    void blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB, GLenum sAlpha, GLenum dAlpha) override;
+    void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override;
+    GLuint boundFrameBufferObject() override;
+    void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
+    bool checkFrameBufferComplete() override;
+    void clearBufferf(GLint drawbuffer, const QVector4D &values) override;
+    GLuint createFrameBufferObject() override;
+    void depthMask(GLenum mode) override;
+    void depthTest(GLenum mode) override;
+    void disableClipPlane(int clipPlane) override;
+    void disablei(GLenum cap, GLuint index) override;
+    void disablePrimitiveRestart() override;
+    void dispatchCompute(GLuint wx, GLuint wy, GLuint wz) override;
+    char *mapBuffer(GLenum target, GLsizeiptr size) override;
+    GLboolean unmapBuffer(GLenum target) override;
+    void drawArrays(GLenum primitiveType, GLint first, GLsizei count) override;
+    void drawArraysIndirect(GLenum mode,void *indirect) override;
+    void drawArraysInstanced(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances) override;
+    void drawArraysInstancedBaseInstance(GLenum primitiveType, GLint first, GLsizei count, GLsizei instances, GLsizei baseInstance) override;
+    void drawBuffers(GLsizei n, const int *bufs) override;
+    void drawElements(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLint baseVertex = 0) override;
+    void drawElementsIndirect(GLenum mode, GLenum type, void *indirect) override;
+    void drawElementsInstancedBaseVertexBaseInstance(GLenum primitiveType, GLsizei primitiveCount, GLint indexType, void *indices, GLsizei instances, GLint baseVertex = 0,  GLint baseInstance = 0) override;
+    void enableClipPlane(int clipPlane) override;
+    void enablei(GLenum cap, GLuint index) override;
+    void enablePrimitiveRestart(int primitiveRestartIndex) override;
+    void enableVertexAttributeArray(int location) override;
+    void frontFace(GLenum mode) override;
+    QSize getRenderBufferDimensions(GLuint renderBufferId) override;
+    QSize getTextureDimensions(GLuint textureId, GLenum target, uint level = 0) override;
+    void initializeHelper(QOpenGLContext *context, QAbstractOpenGLFunctions *functions) override;
+    void pointSize(bool programmable, GLfloat value) override;
+    GLint maxClipPlaneCount() override;
+    void memoryBarrier(QMemoryBarrier::Operations barriers) override;
+    QVector<ShaderUniformBlock> programUniformBlocks(GLuint programId) override;
+    QVector<ShaderAttribute> programAttributesAndLocations(GLuint programId) override;
+    QVector<ShaderUniform> programUniformsAndLocations(GLuint programId) override;
+    QVector<ShaderStorageBlock> programShaderStorageBlocks(GLuint programId) override;
+    void releaseFrameBufferObject(GLuint frameBufferId) override;
+    void setMSAAEnabled(bool enable) override;
+    void setAlphaCoverageEnabled(bool enable) override;
+    void setClipPlane(int clipPlane, const QVector3D &normal, float distance) override;
+    void setSeamlessCubemap(bool enable) override;
+    void setVerticesPerPatch(GLint verticesPerPatch) override;
+    bool supportsFeature(Feature feature) const override;
+    uint uniformByteSize(const ShaderUniform &description) override;
+    void useProgram(GLuint programId) override;
+    void vertexAttribDivisor(GLuint index, GLuint divisor) override;
+    void vertexAttributePointer(GLenum shaderDataType, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer) override;
+    void readBuffer(GLenum mode) override;
+    void drawBuffer(GLenum mode) override;
+
+    void glUniform1fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniform4fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    void glUniform1iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform2iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform3iv(GLint location, GLsizei count, const GLint *value) override;
+    void glUniform4iv(GLint location, GLsizei count, const GLint *value) override;
+
+    void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) override;
+    void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) override;
+
+    void glUniformMatrix2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix2x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x2fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix3x4fv(GLint location, GLsizei count, const GLfloat *value) override;
+    void glUniformMatrix4x3fv(GLint location, GLsizei count, const GLfloat *value) override;
+
+    UniformType uniformTypeFromGLType(GLenum glType) override;
 
 private:
     QOpenGLFunctions_4_3_Core *m_funcs;
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h
index 31ec47ac0..dbfed1a41 100644
--- a/src/render/io/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
@@ -60,7 +60,7 @@ public:
     explicit QSceneLoader(Qt3DCore::QNode *parent = nullptr);
     ~QSceneLoader();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
     enum Status {
         None = 0,
         Loading,
@@ -100,7 +100,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QSceneLoader)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index 42e3121c9..fe483774f 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT Scene : public BackendNode
 public:
     Scene();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     QUrl source() const;
     void setSceneSubtree(Qt3DCore::QEntity *subTree);
     void setSceneManager(SceneManager *manager);
@@ -91,9 +91,9 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit RenderSceneFunctor(AbstractRenderer *renderer, SceneManager *sceneManager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 
 private:
     SceneManager *m_sceneManager;
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index d7dd8c752..fa2350226 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -72,7 +72,7 @@ class SceneDownloader : public Qt3DCore::QDownloadRequest {
 public:
     SceneDownloader(const QUrl &source, Qt3DCore::QNodeId sceneComponent, SceneManager* manager);
 
-    void onCompleted() Q_DECL_OVERRIDE;
+    void onCompleted() override;
 
 private:
     Qt3DCore::QNodeId m_sceneComponent;
diff --git a/src/render/jobs/calcboundingvolumejob_p.h b/src/render/jobs/calcboundingvolumejob_p.h
index cd09aa37b..41a8bd6c1 100644
--- a/src/render/jobs/calcboundingvolumejob_p.h
+++ b/src/render/jobs/calcboundingvolumejob_p.h
@@ -72,7 +72,7 @@ public:
 
     void setRoot(Entity *node);
     void setManagers(NodeManagers *manager);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     NodeManagers *m_manager;
diff --git a/src/render/jobs/calcgeometrytrianglevolumes_p.h b/src/render/jobs/calcgeometrytrianglevolumes_p.h
index 4b77d6f5e..205a23b25 100644
--- a/src/render/jobs/calcgeometrytrianglevolumes_p.h
+++ b/src/render/jobs/calcgeometrytrianglevolumes_p.h
@@ -67,7 +67,7 @@ class Q_AUTOTEST_EXPORT CalcGeometryTriangleVolumes : public Qt3DCore::QAspectJo
 {
 public:
     explicit CalcGeometryTriangleVolumes(const Qt3DCore::QNodeId geometryRendererId, NodeManagers *manager);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Qt3DCore::QNodeId m_geometryRendererId;
diff --git a/src/render/jobs/computefilteredboundingvolumejob_p.h b/src/render/jobs/computefilteredboundingvolumejob_p.h
index d7681e604..ed336fe08 100644
--- a/src/render/jobs/computefilteredboundingvolumejob_p.h
+++ b/src/render/jobs/computefilteredboundingvolumejob_p.h
@@ -71,7 +71,7 @@ public:
 
     void setRoot(Entity *root);
     void ignoreSubTree(Entity *node);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 protected:
     virtual void finished(const Qt3DRender::Render::Sphere &sphere);
diff --git a/src/render/jobs/expandboundingvolumejob_p.h b/src/render/jobs/expandboundingvolumejob_p.h
index 2153e3035..f468cf816 100644
--- a/src/render/jobs/expandboundingvolumejob_p.h
+++ b/src/render/jobs/expandboundingvolumejob_p.h
@@ -69,7 +69,7 @@ public:
     ExpandBoundingVolumeJob();
 
     void setRoot(Entity *root);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Entity *m_node;
diff --git a/src/render/jobs/filtercompatibletechniquejob_p.h b/src/render/jobs/filtercompatibletechniquejob_p.h
index 6040149c5..4f7a7146c 100644
--- a/src/render/jobs/filtercompatibletechniquejob_p.h
+++ b/src/render/jobs/filtercompatibletechniquejob_p.h
@@ -75,7 +75,7 @@ public:
     void setRenderer(Renderer *renderer);
     Renderer *renderer() const;
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     TechniqueManager *m_manager;
diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h
index 65262a2f6..6a221c7e0 100644
--- a/src/render/jobs/loadbufferjob_p.h
+++ b/src/render/jobs/loadbufferjob_p.h
@@ -71,7 +71,7 @@ public:
     ~LoadBufferJob();
 
     void setNodeManager(NodeManagers *nodeManagers) { m_nodeManagers = nodeManagers; }
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 protected:
     HBuffer m_handle;
diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h
index 2b0331d1c..c02739647 100644
--- a/src/render/jobs/loadgeometryjob_p.h
+++ b/src/render/jobs/loadgeometryjob_p.h
@@ -72,7 +72,7 @@ public:
     void setNodeManagers(NodeManagers *nodeManagers) { m_nodeManagers = nodeManagers; }
 
 protected:
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
     HGeometryRenderer m_handle;
     NodeManagers *m_nodeManagers;
 };
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index 5217c6f43..b33637985 100644
--- a/src/render/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
@@ -79,7 +79,7 @@ public:
     QUrl source() const;
     Qt3DCore::QNodeId sceneComponentId() const;
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     QUrl m_source;
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index 5a32f0203..cc81de812 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -176,7 +176,7 @@ private:
 
     void visit(uint andx, const QVector3D &a,
                uint bndx, const QVector3D &b,
-               uint cndx, const QVector3D &c) Q_DECL_OVERRIDE;
+               uint cndx, const QVector3D &c) override;
     bool intersectsSegmentTriangle(uint andx, const QVector3D &a,
                                    uint bndx, const QVector3D &b,
                                    uint cndx, const QVector3D &c);
@@ -238,7 +238,7 @@ private:
     float m_pickWorldSpaceTolerance;
 
     void visit(uint andx, const QVector3D &a,
-               uint bndx, const QVector3D &b) Q_DECL_OVERRIDE;
+               uint bndx, const QVector3D &b) override;
     bool intersectsSegmentSegment(uint andx, const QVector3D &a,
                                   uint bndx, const QVector3D &b);
     bool rayToLineSegment(const QVector3D& lineStart,const QVector3D& lineEnd,
@@ -358,7 +358,7 @@ private:
     uint m_pointIndex;
     float m_pickWorldSpaceTolerance;
 
-    void visit(uint ndx, const QVector3D &p) Q_DECL_OVERRIDE;
+    void visit(uint ndx, const QVector3D &p) override;
 
     double pointToRayDistance(const QVector3D &a, QVector3D &p)
     {
diff --git a/src/render/jobs/pickboundingvolumeutils_p.h b/src/render/jobs/pickboundingvolumeutils_p.h
index 6e2532ea5..c46f56958 100644
--- a/src/render/jobs/pickboundingvolumeutils_p.h
+++ b/src/render/jobs/pickboundingvolumeutils_p.h
@@ -146,8 +146,8 @@ struct Q_AUTOTEST_EXPORT AbstractCollisionGathererFunctor
 
 struct Q_AUTOTEST_EXPORT EntityCollisionGathererFunctor : public AbstractCollisionGathererFunctor
 {
-    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) Q_DECL_OVERRIDE;
-    HitList pick(const Entity *entity) const Q_DECL_OVERRIDE;
+    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) override;
+    HitList pick(const Entity *entity) const override;
 };
 
 struct Q_AUTOTEST_EXPORT TriangleCollisionGathererFunctor : public AbstractCollisionGathererFunctor
@@ -155,24 +155,24 @@ struct Q_AUTOTEST_EXPORT TriangleCollisionGathererFunctor : public AbstractColli
     bool m_frontFaceRequested;
     bool m_backFaceRequested;
 
-    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) Q_DECL_OVERRIDE;
-    HitList pick(const Entity *entity) const Q_DECL_OVERRIDE;
+    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) override;
+    HitList pick(const Entity *entity) const override;
 };
 
 struct Q_AUTOTEST_EXPORT LineCollisionGathererFunctor : public AbstractCollisionGathererFunctor
 {
     float m_pickWorldSpaceTolerance;
 
-    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) Q_DECL_OVERRIDE;
-    HitList pick(const Entity *entity) const Q_DECL_OVERRIDE;
+    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) override;
+    HitList pick(const Entity *entity) const override;
 };
 
 struct Q_AUTOTEST_EXPORT PointCollisionGathererFunctor : public AbstractCollisionGathererFunctor
 {
     float m_pickWorldSpaceTolerance;
 
-    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) Q_DECL_OVERRIDE;
-    HitList pick(const Entity *entity) const Q_DECL_OVERRIDE;
+    HitList computeHits(const QVector<Entity *> &entities, bool allHitsRequested) override;
+    HitList pick(const Entity *entity) const override;
 };
 
 } // PickingUtils
diff --git a/src/render/jobs/renderviewinitializerjob_p.h b/src/render/jobs/renderviewinitializerjob_p.h
index 0ee017df9..fb4e2c67c 100644
--- a/src/render/jobs/renderviewinitializerjob_p.h
+++ b/src/render/jobs/renderviewinitializerjob_p.h
@@ -88,7 +88,7 @@ public:
     inline void setSubmitOrderIndex(int index) { m_index = index; }
     inline int submitOrderIndex() const { return m_index; }
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Renderer *m_renderer;
diff --git a/src/render/jobs/updatetreeenabledjob_p.h b/src/render/jobs/updatetreeenabledjob_p.h
index 19b71e229..132271eaa 100644
--- a/src/render/jobs/updatetreeenabledjob_p.h
+++ b/src/render/jobs/updatetreeenabledjob_p.h
@@ -69,7 +69,7 @@ public:
     UpdateTreeEnabledJob();
 
     void setRoot(Entity *root);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Entity *m_node;
diff --git a/src/render/jobs/updateworldboundingvolumejob_p.h b/src/render/jobs/updateworldboundingvolumejob_p.h
index 14717eb4e..affe78045 100644
--- a/src/render/jobs/updateworldboundingvolumejob_p.h
+++ b/src/render/jobs/updateworldboundingvolumejob_p.h
@@ -68,7 +68,7 @@ public:
     UpdateWorldBoundingVolumeJob();
 
     inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     EntityManager *m_manager;
diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h
index 70e54b840..a85310e5c 100644
--- a/src/render/jobs/updateworldtransformjob_p.h
+++ b/src/render/jobs/updateworldtransformjob_p.h
@@ -69,7 +69,7 @@ public:
     UpdateWorldTransformJob();
 
     void setRoot(Entity *root);
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     Entity *m_node;
diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h
index 19deb1bcc..e1f552b2e 100644
--- a/src/render/lights/light_p.h
+++ b/src/render/lights/light_p.h
@@ -77,7 +77,7 @@ class RenderLightFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit RenderLightFunctor(AbstractRenderer *renderer, NodeManagers *managers);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
     void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
 
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index 33a88b215..23d2d5f7e 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -86,7 +86,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAbstractLight)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/lights/qenvironmentlight.h b/src/render/lights/qenvironmentlight.h
index 0a5087c42..c3d180233 100644
--- a/src/render/lights/qenvironmentlight.h
+++ b/src/render/lights/qenvironmentlight.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QEnvironmentLight)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index 62435b582..fbb5f866a 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -70,7 +70,7 @@ public:
     ~Effect();
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void appendRenderTechnique(Qt3DCore::QNodeId t);
 
     QVector<Qt3DCore::QNodeId> techniques() const;
diff --git a/src/render/materialsystem/filterkey_p.h b/src/render/materialsystem/filterkey_p.h
index 6a098861c..497002e34 100644
--- a/src/render/materialsystem/filterkey_p.h
+++ b/src/render/materialsystem/filterkey_p.h
@@ -71,7 +71,7 @@ public:
 
     const QVariant &value() const { return m_value; }
     const QString &name() const { return m_name; }
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     bool operator ==(const FilterKey &other);
     bool operator !=(const FilterKey &other);
 
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index fe2707549..a80d62af9 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -79,7 +79,7 @@ public:
     ~Material();
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     QVector<Qt3DCore::QNodeId> parameters() const;
     Qt3DCore::QNodeId effect() const;
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 21c88b56e..744db06d3 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -71,7 +71,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     QString name() const;
     int nameId() const Q_DECL_NOTHROW { return m_nameId; }
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h
index 549003608..0a65311ba 100644
--- a/src/render/materialsystem/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
@@ -71,7 +71,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QEffect)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h
index 16db2a9e8..38951a638 100644
--- a/src/render/materialsystem/qfilterkey.h
+++ b/src/render/materialsystem/qfilterkey.h
@@ -72,7 +72,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QFilterKey)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index e11d30e5c..6cc3dd910 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -80,7 +80,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QMaterial)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 }
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index c742b5e22..b9f7aca36 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -79,7 +79,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QParameter)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index 9c608d0c4..174da7267 100644
--- a/src/render/materialsystem/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
@@ -93,7 +93,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderPass)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 }
diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index e695d1eb0..c35f1d6af 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -68,14 +68,14 @@ public:
 
     PropertyReaderInterfacePtr propertyReader() const;
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
 protected:
     explicit QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
 private:
     Q_DECLARE_PRIVATE(QShaderData)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h
index 17faee9ed..258c962ee 100644
--- a/src/render/materialsystem/qshaderdata_p.h
+++ b/src/render/materialsystem/qshaderdata_p.h
@@ -67,7 +67,7 @@ const int qVectorShaderDataTypeId = qMetaTypeId<QVector<QShaderData*> >();
 
 class QShaderDataPropertyReader: public PropertyReaderInterface
 {
-    QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE
+    QVariant readProperty(const QVariant &v) override
     {
         const auto node = v.value<Qt3DCore::QNode *>();
 
diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index 8c3da1a4a..efcfa792e 100644
--- a/src/render/materialsystem/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
@@ -118,11 +118,11 @@ Q_SIGNALS:
 
 protected:
     explicit QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QShaderProgram)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 }
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h
index d8903232a..fbbf7c752 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.h
+++ b/src/render/materialsystem/qshaderprogrambuilder.h
@@ -102,7 +102,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QShaderProgramBuilder)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 }
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index cf5c034e8..19f8e8c56 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -84,7 +84,7 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QTechnique)
     Q_PRIVATE_SLOT(d_func(), void _q_graphicsApiFilterChanged())
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 }
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index cfce68bbe..f14895322 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -79,7 +79,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     Qt3DCore::QNodeId shaderProgram() const;
     QVector<Qt3DCore::QNodeId> filterKeys() const;
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index a5fdc7cd9..06c38ed43 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -99,7 +99,7 @@ public:
     QVector<QByteArray> shaderCode() const;
     void setShaderCode(QShaderProgram::ShaderType type, const QByteArray &code);
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     bool isLoaded() const { QMutexLocker lock(&m_mutex); return m_isLoaded; }
     void setLoaded(bool loaded) { QMutexLocker lock(&m_mutex); m_isLoaded = loaded; }
     ProgramDNA dna() const Q_DECL_NOTHROW { return m_dna; }
diff --git a/src/render/materialsystem/shaderbuilder_p.h b/src/render/materialsystem/shaderbuilder_p.h
index 9fff5df97..6a90c969e 100644
--- a/src/render/materialsystem/shaderbuilder_p.h
+++ b/src/render/materialsystem/shaderbuilder_p.h
@@ -95,7 +95,7 @@ public:
 
     void generateCode(ShaderType type);
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index 987687eab..2b053032c 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -97,8 +97,8 @@ public:
     void setManagers(NodeManagers *managers);
 
 protected:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     PropertyReaderInterfacePtr m_propertyReader;
 
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index 76a86158a..b94b2da60 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -80,7 +80,7 @@ public:
     ~Technique();
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     QVector<Qt3DCore::QNodeId> parameters() const;
 
     void appendRenderPass(Qt3DCore::QNodeId renderPassId);
@@ -116,9 +116,9 @@ class TechniqueFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit TechniqueFunctor(AbstractRenderer *renderer, NodeManagers *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 private:
     NodeManagers *m_manager;
     AbstractRenderer *m_renderer;
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index 950fff2cc..9f3b138c3 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -86,11 +86,11 @@ Q_SIGNALS:
     void containsMouseChanged(bool containsMouse);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QObjectPicker)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3D
diff --git a/src/render/raycasting/qraycastingservice_p.h b/src/render/raycasting/qraycastingservice_p.h
index 926f896f0..56d9e226e 100644
--- a/src/render/raycasting/qraycastingservice_p.h
+++ b/src/render/raycasting/qraycastingservice_p.h
@@ -74,11 +74,11 @@ class QT3DRENDERSHARED_EXPORT QRayCastingService : public QAbstractCollisionQuer
 public:
     QRayCastingService();
 
-    QQueryHandle query(const QRay3D &ray, QueryMode mode, QBoundingVolumeProvider *provider) Q_DECL_OVERRIDE;
-    QCollisionQueryResult::Hit query(const QRay3D &ray, const QBoundingVolume *volume) Q_DECL_OVERRIDE;
+    QQueryHandle query(const QRay3D &ray, QueryMode mode, QBoundingVolumeProvider *provider) override;
+    QCollisionQueryResult::Hit query(const QRay3D &ray, const QBoundingVolume *volume) override;
 
-    QCollisionQueryResult fetchResult(const QQueryHandle &handle) Q_DECL_OVERRIDE;
-    QVector<QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
+    QCollisionQueryResult fetchResult(const QQueryHandle &handle) override;
+    QVector<QCollisionQueryResult> fetchAllResults() const override;
 
 protected:
     QRayCastingService(QRayCastingServicePrivate &dd);
diff --git a/src/render/renderstates/genericstate_p.h b/src/render/renderstates/genericstate_p.h
index 4a55b1501..236d36690 100644
--- a/src/render/renderstates/genericstate_p.h
+++ b/src/render/renderstates/genericstate_p.h
@@ -94,13 +94,13 @@ public:
         return this;
     }
 
-    bool equalTo(const RenderStateImpl &renderState) const Q_DECL_OVERRIDE
+    bool equalTo(const RenderStateImpl &renderState) const override
     {
         const GenericState *other = static_cast<const GenericState*>(&renderState);
         return (other != NULL && other->m_values == m_values);
     }
 
-    StateMask mask() const Q_DECL_OVERRIDE
+    StateMask mask() const override
     {
         return GenericState::type();
     }
diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h
index 67106ade5..8545d2043 100644
--- a/src/render/renderstates/qalphatest.h
+++ b/src/render/renderstates/qalphatest.h
@@ -84,7 +84,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAlphaTest)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h
index 8bdfe4907..d084113d7 100644
--- a/src/render/renderstates/qblendequation.h
+++ b/src/render/renderstates/qblendequation.h
@@ -78,7 +78,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QBlendEquation)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h
index 5f613770a..1b2e039f7 100644
--- a/src/render/renderstates/qblendequationarguments.h
+++ b/src/render/renderstates/qblendequationarguments.h
@@ -117,7 +117,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QBlendEquationArguments)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h
index 46c44ad44..fa210d668 100644
--- a/src/render/renderstates/qclipplane.h
+++ b/src/render/renderstates/qclipplane.h
@@ -75,7 +75,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QClipPlane)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h
index d42f87df0..7d28e80c6 100644
--- a/src/render/renderstates/qcolormask.h
+++ b/src/render/renderstates/qcolormask.h
@@ -79,7 +79,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QColorMask)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h
index 8598d3b88..ab60d342e 100644
--- a/src/render/renderstates/qcullface.h
+++ b/src/render/renderstates/qcullface.h
@@ -79,7 +79,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QCullFace)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h
index 9482ef9a5..91c06c649 100644
--- a/src/render/renderstates/qdepthtest.h
+++ b/src/render/renderstates/qdepthtest.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QDepthTest)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h
index 0f1061280..9ef32d8ed 100644
--- a/src/render/renderstates/qfrontface.h
+++ b/src/render/renderstates/qfrontface.h
@@ -75,7 +75,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QFrontFace)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qlinewidth.h b/src/render/renderstates/qlinewidth.h
index 08b395982..764ebc82a 100644
--- a/src/render/renderstates/qlinewidth.h
+++ b/src/render/renderstates/qlinewidth.h
@@ -70,7 +70,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QLineWidth)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h
index 621d983b8..7e50a7953 100644
--- a/src/render/renderstates/qpointsize.h
+++ b/src/render/renderstates/qpointsize.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QPointSize)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h
index 3be117fb3..f89203c6b 100644
--- a/src/render/renderstates/qpolygonoffset.h
+++ b/src/render/renderstates/qpolygonoffset.h
@@ -71,7 +71,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QPolygonOffset)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h
index 0ecc805e3..6892432be 100644
--- a/src/render/renderstates/qrenderstate.h
+++ b/src/render/renderstates/qrenderstate.h
@@ -61,7 +61,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QRenderState)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h
index 65327bd39..f94e997f8 100644
--- a/src/render/renderstates/qscissortest.h
+++ b/src/render/renderstates/qscissortest.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QScissorTest)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h
index e0487c4f3..5f6e3b686 100644
--- a/src/render/renderstates/qstencilmask.h
+++ b/src/render/renderstates/qstencilmask.h
@@ -70,7 +70,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QStencilMask)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qstenciloperation.h b/src/render/renderstates/qstenciloperation.h
index 8a8491f59..889bb73dc 100644
--- a/src/render/renderstates/qstenciloperation.h
+++ b/src/render/renderstates/qstenciloperation.h
@@ -64,7 +64,7 @@ public:
 
 private:
     Q_DECLARE_PRIVATE(QStencilOperation)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h
index 894a4f561..0178ef968 100644
--- a/src/render/renderstates/qstenciltest.h
+++ b/src/render/renderstates/qstenciltest.h
@@ -64,7 +64,7 @@ public:
 
 private:
     Q_DECLARE_PRIVATE(QStencilTest)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/renderstatenode_p.h b/src/render/renderstates/renderstatenode_p.h
index dbcf4de7b..97a2d5e4d 100644
--- a/src/render/renderstates/renderstatenode_p.h
+++ b/src/render/renderstates/renderstatenode_p.h
@@ -63,7 +63,7 @@ public:
     RenderStateNode();
     virtual ~RenderStateNode();
 
-    virtual void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     StateMaskSet mask() const { return m_impl.type; }
     StateVariant impl() const { return m_impl; }
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h
index 2b1af1c4c..82ba084e3 100644
--- a/src/render/renderstates/renderstates_p.h
+++ b/src/render/renderstates/renderstates_p.h
@@ -62,139 +62,139 @@ namespace Render {
 class Q_AUTOTEST_EXPORT BlendEquationArguments : public GenericState<BlendEquationArguments, BlendEquationArgumentsMask, GLenum, GLenum, GLenum, GLenum, bool, int>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT BlendEquation : public GenericState<BlendEquation, BlendStateMask, GLenum>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 
 class Q_AUTOTEST_EXPORT AlphaFunc : public GenericState<AlphaFunc, AlphaTestMask, GLenum, GLclampf>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT MSAAEnabled : public GenericState<MSAAEnabled, MSAAEnabledStateMask, GLboolean>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT DepthTest : public GenericState<DepthTest, DepthTestStateMask, GLenum>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT NoDepthMask : public GenericState<NoDepthMask, DepthWriteStateMask, GLboolean>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT CullFace : public GenericState<CullFace, CullFaceStateMask, GLenum>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT FrontFace : public GenericState<FrontFace, FrontFaceStateMask, GLenum>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT Dithering : public GenericState<Dithering, DitheringStateMask>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
 };
 
 class Q_AUTOTEST_EXPORT ScissorTest : public GenericState<ScissorTest, ScissorStateMask, int, int, int, int>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT StencilTest : public GenericState<StencilTest, StencilTestStateMask, GLenum, int, uint, GLenum, int, uint>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
 };
 
 class Q_AUTOTEST_EXPORT PointSize : public GenericState<PointSize, PointSizeMask, bool, GLfloat>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT PolygonOffset : public GenericState<PolygonOffset, PolygonOffsetStateMask, GLfloat, GLfloat>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT ColorMask : public GenericState<ColorMask, ColorStateMask, GLboolean, GLboolean, GLboolean, GLboolean>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_FINAL;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT ClipPlane : public GenericState<ClipPlane, ClipPlaneMask, int, QVector3D, float>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_FINAL;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask>
 {
 public:
-    virtual void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
+    void apply(GraphicsContext *gc) const override;
 };
 
 class Q_AUTOTEST_EXPORT StencilOp : public GenericState<StencilOp, StencilOpMask, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_FINAL;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT StencilMask : public GenericState<StencilMask, StencilWriteStateMask, uint, uint>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_FINAL;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 class Q_AUTOTEST_EXPORT LineWidth : public GenericState<LineWidth, LineWidthMask, GLfloat, bool>
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_FINAL;
-    void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
+    void updateProperty(const char *name, const QVariant &value) override;
 };
 
 } // namespace Render
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index 5a1106787..f17633710 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -332,13 +332,13 @@ protected:
     explicit QAbstractTexture(Qt3DCore::QNode *parent = nullptr);
     explicit QAbstractTexture(Target target, Qt3DCore::QNode *parent = nullptr);
     explicit QAbstractTexture(QAbstractTexturePrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
     void setStatus(Status status);
 
 private:
     Q_DECLARE_PRIVATE(QAbstractTexture)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index 7041483b2..7e840fdd4 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -80,7 +80,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QAbstractTextureImage)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/texture/qpaintedtextureimage.h b/src/render/texture/qpaintedtextureimage.h
index ff62da118..5b884a42e 100644
--- a/src/render/texture/qpaintedtextureimage.h
+++ b/src/render/texture/qpaintedtextureimage.h
@@ -83,7 +83,7 @@ protected:
 private:
     Q_DECLARE_PRIVATE(QPaintedTextureImage)
 
-    QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE;
+    QTextureImageDataGeneratorPtr dataGenerator() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/texture/qtexture_p.h b/src/render/texture/qtexture_p.h
index 490eed487..1c2f598db 100644
--- a/src/render/texture/qtexture_p.h
+++ b/src/render/texture/qtexture_p.h
@@ -81,7 +81,7 @@ class Q_AUTOTEST_EXPORT TextureDownloadRequest : public Qt3DCore::QDownloadReque
 public:
     TextureDownloadRequest(Qt3DCore::QNodeId texture, const QUrl &url, Qt3DCore::QAspectEngine *engine);
 
-    void onCompleted() Q_DECL_OVERRIDE;
+    void onCompleted() override;
 
 private:
     Qt3DCore::QNodeId m_texture;
@@ -95,8 +95,8 @@ public:
                                          Qt3DCore::QAspectEngine *engine,
                                          Qt3DCore::QNodeId textureId);
 
-    QTextureDataPtr operator ()() Q_DECL_OVERRIDE;
-    bool operator ==(const QTextureGenerator &other) const Q_DECL_OVERRIDE;
+    QTextureDataPtr operator ()() override;
+    bool operator ==(const QTextureGenerator &other) const override;
     inline QAbstractTexture::Status status() const { return m_status; }
 
     QT3D_FUNCTOR(QTextureFromSourceGenerator)
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index e2ab54a1b..cc86dfae1 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -82,11 +82,11 @@ Q_SIGNALS:
     void mirroredChanged(bool mirrored);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
     void setStatus(Status status);
 
 private:
-    QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE;
+    QTextureImageDataGeneratorPtr dataGenerator() const override;
     Q_DECLARE_PRIVATE(QTextureImage)
 };
 
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index 325d1567f..ec7717d6d 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -150,7 +150,7 @@ public:
     void removeTextureImage(Qt3DCore::QNodeId id);
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline const TextureProperties& properties() const { return m_properties; }
     inline const TextureParameters& parameters() const { return m_parameters; }
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index c165f7044..19cc95a61 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -80,7 +80,7 @@ public:
 
     void setTextureManager(TextureManager *manager);
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline int layer() const { return m_layer; }
     inline int mipLevel() const { return m_mipLevel; }
diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index 28ab8917a..d51e64925 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -50,7 +50,7 @@ public:
         , m_duration(duration)
     {}
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index 9bc7a8c47..ec311713c 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -81,7 +81,7 @@ public:
         m_value2Id = value2Id;
     }
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index b64e263bf..6e24624b6 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -54,7 +54,7 @@ public:
         , m_clipResults(clipResults)
     {}
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
diff --git a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
index 7bcef28ae..5b35fd349 100644
--- a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
+++ b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
@@ -49,7 +49,7 @@ public:
         deadCount += 1;
     }
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
diff --git a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
index 003b1ef53..7379431f7 100644
--- a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
+++ b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
@@ -50,7 +50,7 @@ public:
         , m_duration(duration)
     {}
 
-    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const Q_DECL_OVERRIDE
+    inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
         return currentDependencyIds();
     }
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 25c2a6dba..1e1b1a3aa 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -138,19 +138,19 @@ public:
     {
     }
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) override
     {
         events << ChangeRecord(e, true);
     }
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) override
     {
         for (size_t i = 0, m = e.size(); i < m; ++i) {
             events << ChangeRecord(e.at(i), false);
         }
     }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         events << ChangeRecord(e, false);
     }
diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
index ba76d2100..94519f5e5 100644
--- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
+++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
@@ -46,23 +46,23 @@ public:
     }
 
 private:
-    void onRegistered() Q_DECL_OVERRIDE
+    void onRegistered() override
     {
         qDebug() << Q_FUNC_INFO;
     }
 
-    void onEngineStartup() Q_DECL_OVERRIDE
+    void onEngineStartup() override
     {
         qDebug() << Q_FUNC_INFO;
         m_rootEntityId = rootEntityId();
     }
 
-    void onEngineShutdown() Q_DECL_OVERRIDE
+    void onEngineShutdown() override
     {
         qDebug() << Q_FUNC_INFO;
     }
 
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     {
         if (m_rootEntityId)
             qDebug() << Q_FUNC_INFO << m_rootEntityId;
@@ -81,16 +81,16 @@ public: \
         : QAbstractAspect(parent) {} \
     \
 private: \
-    void onRegistered() Q_DECL_OVERRIDE {} \
-    void onEngineStartup() Q_DECL_OVERRIDE {} \
-    void onEngineShutdown() Q_DECL_OVERRIDE {} \
+    void onRegistered() override {} \
+    void onEngineStartup() override {} \
+    void onEngineShutdown() override {} \
     \
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     { \
         return QVector<QAspectJobPtr>(); \
     } \
     \
-    QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE \
+    QVariant executeCommand(const QStringList &args) override \
     { \
         if (args.size() >= 2 && args.first() == QLatin1Literal("echo")) { \
             QStringList list = args; \
diff --git a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
index 0dc8ce10d..87ff528f0 100644
--- a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
+++ b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
@@ -41,11 +41,11 @@ public: \
         : QAbstractAspect(parent) {} \
 \
 private: \
-    void onRegistered() Q_DECL_OVERRIDE {} \
-    void onEngineStartup() Q_DECL_OVERRIDE {} \
-    void onEngineShutdown() Q_DECL_OVERRIDE {} \
+    void onRegistered() override {} \
+    void onEngineStartup() override {} \
+    void onEngineShutdown() override {} \
 \
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     { \
         return QVector<QAspectJobPtr>(); \
     } \
diff --git a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
index b9f7934ab..b5750e639 100644
--- a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
+++ b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
@@ -34,7 +34,7 @@ using namespace Qt3DCore;
 class FakeAspectJob : public QAspectJob
 {
 public:
-    void run() Q_DECL_OVERRIDE {}
+    void run() override {}
 };
 
 class tst_QAspectJob : public QObject
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 57f7e7ed4..cf7874a5c 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -117,7 +117,7 @@ public:
         Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override
     {
         QVERIFY(!change.isNull());
         m_lastChanges << change;
@@ -182,7 +182,7 @@ class tst_SimpleObserver : public Qt3DCore::QObserverInterface
 public:
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         QVERIFY(!e.isNull());
         m_lastChanges.append(e);
@@ -218,7 +218,7 @@ public:
     {}
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         QVERIFY(!e.isNull());
         m_lastChanges << e;
@@ -271,7 +271,7 @@ public:
 
     ~ThreadedAnswer() { qDebug() << this; }
 
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         // create backend change queue on QChangeArbiter
         Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(m_arbiter);
diff --git a/tests/auto/core/qpostman/tst_qpostman.cpp b/tests/auto/core/qpostman/tst_qpostman.cpp
index 612db6257..6fcb6e840 100644
--- a/tests/auto/core/qpostman/tst_qpostman.cpp
+++ b/tests/auto/core/qpostman/tst_qpostman.cpp
@@ -53,7 +53,7 @@ public:
     inline bool hasReceivedChange() const { return m_hasReceivedChange; }
 
 protected:
-    void sceneChangeEvent(const QSceneChangePtr &) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const QSceneChangePtr &) override
     {
         m_hasReceivedChange = true;
     }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 78f17e8fa..36ec14b4e 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -63,9 +63,9 @@ private slots:
 class tst_LockableObserver : public Qt3DCore::QLockableObserverInterface
 {
 public:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &) Q_DECL_OVERRIDE {}
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) override {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &) override {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &) override {}
 };
 
 class tst_Observable : public Qt3DCore::QObservableInterface
diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp
index 2fc6e8c3b..bc4552c66 100644
--- a/tests/auto/core/threadpooler/tst_threadpooler.cpp
+++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp
@@ -86,7 +86,7 @@ public:
 
     void setMutex(QMutex *mutex);
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     TestFunction m_func;
@@ -119,7 +119,7 @@ class MassAspectJob : public Qt3DCore::QAspectJob
 public:
     MassAspectJob(MassFunction func, QVector3D *data);
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     MassFunction m_func;
diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
index 97e9b7c77..1390b6b49 100644
--- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
+++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
@@ -47,7 +47,7 @@ public:
     }
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override
     {
         auto creationChange = Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAbstractAxisInputData>::create(this);
         auto &data = creationChange->data;
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    float process(Qt3DInput::Input::InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE
+    float process(Qt3DInput::Input::InputHandler *inputHandler, qint64 currentTime) override
     {
         Q_UNUSED(inputHandler);
         Q_UNUSED(currentTime);
diff --git a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
index d3745b8cb..a436959cc 100644
--- a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
+++ b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
@@ -47,35 +47,35 @@ public:
         , m_name(name)
     {}
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) override
     {
         return QVector<Qt3DCore::QAspectJobPtr>();
     }
 
-    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) override
     {
         if (name == m_name)
             return new TestPhysicalDevice();
         return nullptr;
     }
 
-    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId) const Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId) const override
     {
         return nullptr;
     }
 
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_OVERRIDE
+    QVector<Qt3DCore::QNodeId> physicalDevices() const override
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
-    QStringList deviceNames() const Q_DECL_OVERRIDE
+    QStringList deviceNames() const override
     {
         return QStringList() << m_name;
     }
 
 private:
-    void onInitialize() Q_DECL_OVERRIDE {}
+    void onInitialize() override {}
     QString m_name;
 };
 
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
index 0cf37fe95..d146a80e7 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
@@ -49,14 +49,14 @@ public:
         : Qt3DInput::QAbstractPhysicalDeviceBackendNode(mode)
     {}
 
-    float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE
+    float axisValue(int axisIdentifier) const override
     {
         if (axisIdentifier == 883)
             return 883.0f;
         return 0.0f;
     }
 
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE
+    bool isButtonPressed(int buttonIdentifier) const override
     {
         if (buttonIdentifier == 454)
             return true;
diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp
index 766408ce3..d90034a3f 100644
--- a/tests/auto/input/utils/tst_utils.cpp
+++ b/tests/auto/input/utils/tst_utils.cpp
@@ -56,12 +56,12 @@ public:
         , m_device(device)
     {}
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE { return QVector<Qt3DCore::QAspectJobPtr>(); }
-    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &) Q_DECL_OVERRIDE { return nullptr; }
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_OVERRIDE { return QVector<Qt3DCore::QNodeId>(); }
-    QStringList deviceNames() const Q_DECL_OVERRIDE { return QStringList(); }
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) override { return QVector<Qt3DCore::QAspectJobPtr>(); }
+    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &) override { return nullptr; }
+    QVector<Qt3DCore::QNodeId> physicalDevices() const override { return QVector<Qt3DCore::QNodeId>(); }
+    QStringList deviceNames() const override { return QStringList(); }
 
-    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId deviceId) const Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId deviceId) const override
     {
         if (m_device->id() == deviceId)
             return new FakeBackendDevice();
@@ -69,7 +69,7 @@ public:
     }
 
 private:
-    void onInitialize() Q_DECL_OVERRIDE {}
+    void onInitialize() override {}
     Qt3DInput::QAbstractPhysicalDevice *m_device;
 };
 
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
index ab0240419..62d71b224 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
@@ -61,27 +61,27 @@ public:
         endInsertRows();
     }
 
-    int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE
+    int rowCount(const QModelIndex &) const override
     {
         return items.count();
     }
 
-    virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE
+    QHash<int, QByteArray> roleNames() const override
     {
         return roles;
     }
 
-    virtual int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE
+    int columnCount(const QModelIndex &) const override
     {
         return 1;
     }
 
-    virtual bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE
+    bool hasChildren(const QModelIndex &) const override
     {
         return rowCount(QModelIndex()) > 0;
     }
 
-    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override
     {
         Q_UNUSED(column);
         if (row>=0 && row<rowCount(parent))
@@ -90,12 +90,12 @@ public:
             return QModelIndex();
     }
 
-    virtual QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE
+    QModelIndex parent(const QModelIndex &) const override
     {
         return QModelIndex();
     }
 
-    QVariant data (const QModelIndex & index, int role) const Q_DECL_OVERRIDE
+    QVariant data (const QModelIndex & index, int role) const override
     {
         int row = index.row();
         if ((row<0) || (row>=items.count()))
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 031ca214b..b26a3ffad 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -39,46 +39,46 @@ public:
     TestRenderer();
     ~TestRenderer();
 
-    void dumpInfo() const Q_DECL_OVERRIDE {}
-    API api() const Q_DECL_OVERRIDE { return AbstractRenderer::OpenGL; }
-    qint64 time() const Q_DECL_OVERRIDE { return 0; }
-    void setTime(qint64 time) Q_DECL_OVERRIDE { Q_UNUSED(time); }
-    void setNodeManagers(Qt3DRender::Render::NodeManagers *m) Q_DECL_OVERRIDE { m_managers = m; }
-    void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE { Q_UNUSED(services); }
-    void setSurfaceExposed(bool exposed) Q_DECL_OVERRIDE { Q_UNUSED(exposed); }
-    Qt3DRender::Render::NodeManagers *nodeManagers() const Q_DECL_OVERRIDE { return m_managers; }
-    Qt3DCore::QServiceLocator *services() const Q_DECL_OVERRIDE { return nullptr; }
-    void initialize() Q_DECL_OVERRIDE {}
-    void shutdown() Q_DECL_OVERRIDE {}
-    void releaseGraphicsResources() Q_DECL_OVERRIDE {}
-    void render() Q_DECL_OVERRIDE {}
-    void doRender() Q_DECL_OVERRIDE {}
-    void cleanGraphicsResources() Q_DECL_OVERRIDE {}
-    bool isRunning() const Q_DECL_OVERRIDE { return true; }
-    bool shouldRender() Q_DECL_OVERRIDE { return true; }
-    void skipNextFrame() Q_DECL_OVERRIDE {}
-    QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() Q_DECL_OVERRIDE { return QVector<Qt3DCore::QAspectJobPtr>(); }
-    Qt3DCore::QAspectJobPtr pickBoundingVolumeJob() Q_DECL_OVERRIDE { return Qt3DCore::QAspectJobPtr(); }
-    Qt3DCore::QAspectJobPtr syncTextureLoadingJob() Q_DECL_OVERRIDE { return Qt3DCore::QAspectJobPtr(); }
-    Qt3DCore::QAspectJobPtr expandBoundingVolumeJob() Q_DECL_OVERRIDE { return Qt3DCore::QAspectJobPtr(); }
-    void setSceneRoot(Qt3DCore::QBackendNodeFactory *factory, Qt3DRender::Render::Entity *root) Q_DECL_OVERRIDE { Q_UNUSED(factory);  Q_UNUSED(root); }
-    Qt3DRender::Render::Entity *sceneRoot() const Q_DECL_OVERRIDE { return nullptr; }
-    Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const Q_DECL_OVERRIDE { return nullptr; }
-    Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const Q_DECL_OVERRIDE { return nullptr; }
-    void registerEventFilter(Qt3DCore::QEventFilterService *service) Q_DECL_OVERRIDE { Q_UNUSED(service); }
-    void setSettings(Qt3DRender::Render::RenderSettings *settings) Q_DECL_OVERRIDE { Q_UNUSED(settings); }
-    Qt3DRender::Render::RenderSettings *settings() const Q_DECL_OVERRIDE { return nullptr; }
+    void dumpInfo() const override {}
+    API api() const override { return AbstractRenderer::OpenGL; }
+    qint64 time() const override { return 0; }
+    void setTime(qint64 time) override { Q_UNUSED(time); }
+    void setNodeManagers(Qt3DRender::Render::NodeManagers *m) override { m_managers = m; }
+    void setServices(Qt3DCore::QServiceLocator *services) override { Q_UNUSED(services); }
+    void setSurfaceExposed(bool exposed) override { Q_UNUSED(exposed); }
+    Qt3DRender::Render::NodeManagers *nodeManagers() const override { return m_managers; }
+    Qt3DCore::QServiceLocator *services() const override { return nullptr; }
+    void initialize() override {}
+    void shutdown() override {}
+    void releaseGraphicsResources() override {}
+    void render() override {}
+    void doRender() override {}
+    void cleanGraphicsResources() override {}
+    bool isRunning() const override { return true; }
+    bool shouldRender() override { return true; }
+    void skipNextFrame() override {}
+    QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() override { return QVector<Qt3DCore::QAspectJobPtr>(); }
+    Qt3DCore::QAspectJobPtr pickBoundingVolumeJob() override { return Qt3DCore::QAspectJobPtr(); }
+    Qt3DCore::QAspectJobPtr syncTextureLoadingJob() override { return Qt3DCore::QAspectJobPtr(); }
+    Qt3DCore::QAspectJobPtr expandBoundingVolumeJob() override { return Qt3DCore::QAspectJobPtr(); }
+    void setSceneRoot(Qt3DCore::QBackendNodeFactory *factory, Qt3DRender::Render::Entity *root) override { Q_UNUSED(factory);  Q_UNUSED(root); }
+    Qt3DRender::Render::Entity *sceneRoot() const override { return nullptr; }
+    Qt3DRender::Render::FrameGraphNode *frameGraphRoot() const override { return nullptr; }
+    Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const override { return nullptr; }
+    void registerEventFilter(Qt3DCore::QEventFilterService *service) override { Q_UNUSED(service); }
+    void setSettings(Qt3DRender::Render::RenderSettings *settings) override { Q_UNUSED(settings); }
+    Qt3DRender::Render::RenderSettings *settings() const override { return nullptr; }
 
-    void markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node) Q_DECL_OVERRIDE;
-    Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet dirtyBits() Q_DECL_OVERRIDE;
-    void clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes) Q_DECL_OVERRIDE;
+    void markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node) override;
+    Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet dirtyBits() override;
+    void clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes) override;
 
     void resetDirty();
-    QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE;
-    QOpenGLContext *shareContext() const Q_DECL_OVERRIDE;
+    QVariant executeCommand(const QStringList &args) override;
+    QOpenGLContext *shareContext() const override;
 
-    void setOffscreenSurfaceHelper(Qt3DRender::Render::OffscreenSurfaceHelper *helper) Q_DECL_OVERRIDE;
-    QSurfaceFormat format() Q_DECL_OVERRIDE;
+    void setOffscreenSurfaceHelper(Qt3DRender::Render::OffscreenSurfaceHelper *helper) override;
+    QSurfaceFormat format() override;
 
 protected:
     Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet m_changes;
diff --git a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
index bd9848928..946a3f305 100644
--- a/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
+++ b/tests/auto/render/loadscenejob/tst_loadscenejob.cpp
@@ -45,29 +45,29 @@ public:
         , m_shouldFail(shouldFail)
     {}
 
-    void setSource(const QUrl &source) Q_DECL_OVERRIDE
+    void setSource(const QUrl &source) override
     {
         m_source = source;
     }
 
-    void setData(const QByteArray& data, const QString &basePath) Q_DECL_OVERRIDE
+    void setData(const QByteArray& data, const QString &basePath) override
     {
         Q_UNUSED(data);
         Q_UNUSED(basePath);
     }
 
-    bool areFileTypesSupported(const QStringList &extensions) const Q_DECL_OVERRIDE
+    bool areFileTypesSupported(const QStringList &extensions) const override
     {
         Q_UNUSED(extensions);
         return m_supportsFormat;
     }
 
-    Qt3DCore::QEntity *scene(const QString &) Q_DECL_OVERRIDE
+    Qt3DCore::QEntity *scene(const QString &) override
     {
         return m_shouldFail ? nullptr : new Qt3DCore::QEntity();
     }
 
-    Qt3DCore::QEntity *node(const QString &) Q_DECL_OVERRIDE
+    Qt3DCore::QEntity *node(const QString &) override
     {
         return m_shouldFail ? nullptr : new Qt3DCore::QEntity();
     }
diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
index bf5f0d55f..c0e871d62 100644
--- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
+++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
@@ -39,12 +39,12 @@ public:
     ~MeshFunctorA()
     {}
 
-    Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE
+    Qt3DRender::QGeometry *operator ()() override
     {
         return nullptr;
     }
 
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFactory &other) const override
     {
         return Qt3DRender::functor_cast<MeshFunctorA>(&other);
     }
@@ -61,12 +61,12 @@ public:
     ~MeshFunctorB()
     {}
 
-    Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE
+    Qt3DRender::QGeometry *operator ()() override
     {
         return nullptr;
     }
 
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFactory &other) const override
     {
         return Qt3DRender::functor_cast<MeshFunctorB>(&other);
     }
@@ -83,7 +83,7 @@ public:
     ~MeshFunctorASub()
     {}
 
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFactory &other) const override
     {
         return Qt3DRender::functor_cast<MeshFunctorASub>(&other);
     }
diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
index 4047cc32d..c7158f4de 100644
--- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
+++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
@@ -47,7 +47,7 @@ class FakeTexture : public Qt3DRender::QAbstractTexture
 class FakeTextureImage : public Qt3DRender::QAbstractTextureImage
 {
 protected:
-    Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE
+    Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override
     {
         return Qt3DRender::QTextureImageDataGeneratorPtr();
     }
diff --git a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
index 5875cb9fc..05029450a 100644
--- a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
+++ b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
@@ -40,7 +40,7 @@
 class FakeTextureImage : public Qt3DRender::QAbstractTextureImage
 {
 protected:
-    Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE
+    Qt3DRender::QTextureImageDataGeneratorPtr dataGenerator() const override
     {
         return Qt3DRender::QTextureImageDataGeneratorPtr();
     }
diff --git a/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp b/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp
index dd931dabf..0bbd630d6 100644
--- a/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp
+++ b/tests/auto/render/qtextureimagedata/tst_qtextureimagedata.cpp
@@ -76,7 +76,7 @@ private Q_SLOTS:
 /*
 protected:
 
-    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const override
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
index fa0dce6af..81d0ee4a2 100644
--- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
@@ -296,7 +296,7 @@ public:
         return m_inner;
     }
 
-    QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) Q_DECL_OVERRIDE
+    QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) override
     {
         QHash<QString, Qt3DRender::Render::ShaderUniform> innerUniforms;
 
@@ -315,7 +315,7 @@ public:
         return uniforms;
     }
 
-    QHash<QString, QVariant> buildUniformMapValues(const QString &blockName) Q_DECL_OVERRIDE
+    QHash<QString, QVariant> buildUniformMapValues(const QString &blockName) override
     {
         QHash<QString, QVariant> innerUniformsValues;
 
diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp
index a78ed0ab1..c30400202 100644
--- a/tests/auto/render/scene2d/tst_scene2d.cpp
+++ b/tests/auto/render/scene2d/tst_scene2d.cpp
@@ -62,7 +62,7 @@ public:
 
     }
 
-    bool event(QEvent *e) Q_DECL_OVERRIDE
+    bool event(QEvent *e) override
     {
         if (e->type() >= QEvent::MouseButtonPress &&
                 e->type() <= QEvent::MouseMove) {
diff --git a/tests/auto/render/textures/tst_textures.cpp b/tests/auto/render/textures/tst_textures.cpp
index 82c638275..bdb44bcaf 100644
--- a/tests/auto/render/textures/tst_textures.cpp
+++ b/tests/auto/render/textures/tst_textures.cpp
@@ -52,11 +52,11 @@ class TestImageDataGenerator : public Qt3DRender::QTextureImageDataGenerator
 public:
     TestImageDataGenerator(int id) : m_id(id) {}
 
-    Qt3DRender::QTextureImageDataPtr operator ()() Q_DECL_OVERRIDE {
+    Qt3DRender::QTextureImageDataPtr operator ()() override {
         return Qt3DRender::QTextureImageDataPtr::create();
     }
 
-    bool operator ==(const Qt3DRender::QTextureImageDataGenerator &other) const Q_DECL_OVERRIDE {
+    bool operator ==(const Qt3DRender::QTextureImageDataGenerator &other) const override {
         const TestImageDataGenerator *otherFunctor = Qt3DRender::functor_cast<TestImageDataGenerator>(&other);
         return (otherFunctor != Q_NULLPTR && otherFunctor->m_id == m_id);
     }
@@ -73,11 +73,11 @@ class TestTextureGenerator : public Qt3DRender::QTextureGenerator
 public:
     TestTextureGenerator(int id) : m_id(id) {}
 
-    Qt3DRender::QTextureDataPtr operator ()() Q_DECL_OVERRIDE {
+    Qt3DRender::QTextureDataPtr operator ()() override {
         return Qt3DRender::QTextureDataPtr::create();
     }
 
-    bool operator ==(const Qt3DRender::QTextureGenerator &other) const Q_DECL_OVERRIDE {
+    bool operator ==(const Qt3DRender::QTextureGenerator &other) const override {
         const TestTextureGenerator *otherFunctor = Qt3DRender::functor_cast<TestTextureGenerator>(&other);
         return (otherFunctor != Q_NULLPTR && otherFunctor->m_id == m_id);
     }
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp
index e5f49bdc6..3cbe6f3d2 100644
--- a/tools/qgltf/qgltf.cpp
+++ b/tools/qgltf/qgltf.cpp
@@ -69,12 +69,12 @@ public:
     AssimpIOStream(QIODevice *device);
     ~AssimpIOStream();
 
-    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) Q_DECL_OVERRIDE;
-    size_t Tell() const Q_DECL_OVERRIDE;
-    size_t FileSize() const Q_DECL_OVERRIDE;
-    void Flush() Q_DECL_OVERRIDE;
+    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override;
+    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) override;
+    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) override;
+    size_t Tell() const override;
+    size_t FileSize() const override;
+    void Flush() override;
 
 private:
     QIODevice *m_device;
@@ -84,10 +84,10 @@ class AssimpIOSystem : public Assimp::IOSystem
 {
 public:
     AssimpIOSystem();
-    bool Exists(const char *pFile) const Q_DECL_OVERRIDE;
-    char getOsSeparator() const Q_DECL_OVERRIDE;
-    Assimp::IOStream *Open(const char *pFile, const char *pMode) Q_DECL_OVERRIDE;
-    void Close(Assimp::IOStream *pFile) Q_DECL_OVERRIDE;
+    bool Exists(const char *pFile) const override;
+    char getOsSeparator() const override;
+    Assimp::IOStream *Open(const char *pFile, const char *pMode) override;
+    void Close(Assimp::IOStream *pFile) override;
 
 private:
     QHash<QByteArray, QIODevice::OpenMode> m_openModeMap;
@@ -491,7 +491,7 @@ class AssimpImporter : public Importer
 public:
     AssimpImporter();
 
-    bool load(const QString &filename) Q_DECL_OVERRIDE;
+    bool load(const QString &filename) override;
 
 private:
     const aiScene *scene() const;
@@ -1262,7 +1262,7 @@ class GltfExporter : public Exporter
 {
 public:
     GltfExporter(Importer *importer);
-    void save(const QString &inputFilename) Q_DECL_OVERRIDE;
+    void save(const QString &inputFilename) override;
 
 private:
     struct ProgramInfo {
diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
index 12ee68155..f977a331e 100644
--- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
+++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
@@ -23,7 +23,7 @@ class %{CN} : public Qt3DCore::%{Base}
 public:
     %{CN}();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h
index c4162d647..5320e31b9 100644
--- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h
+++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/file.h
@@ -43,7 +43,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(%{CN})
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 @endif
 };
 %{JS: Cpp.closeNamespaces('%{Class}')}