Replace Q_DECL_OVERRIDE with override

Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
author: Kevin Funk <kfunk@kde.org> 2017-09-20 20:57:27 +0200
committer: Sean Harmer <sean.harmer@kdab.com> 2017-09-25 10:42:42 +0000
commit: 43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch)
tree: 2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/render
parent: c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff)
138 files changed, 722 insertions, 722 deletions
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; }
author	Kevin Funk <kfunk@kde.org>	2017-09-20 20:57:27 +0200
committer	Sean Harmer <sean.harmer@kdab.com>	2017-09-25 10:42:42 +0000
commit	43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch)
tree	2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/render
parent	c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff)