Replace Q_DECL_FINAL with final

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

147 files changed, 293 insertions, 293 deletions

diff --git a/src/animation/backend/additiveclipblend_p.h b/src/animation/backend/additiveclipblend_p.h
index 83c062cf1..0cf74ad56 100644
--- a/src/animation/backend/additiveclipblend_p.h
+++ b/src/animation/backend/additiveclipblend_p.h
@@ -71,7 +71,7 @@ public:
     inline float additiveFactor() const { return m_additiveFactor; }
     void setAdditiveFactor(float additiveFactor) { m_additiveFactor = additiveFactor; } // For unit tests
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
@@ -91,10 +91,10 @@ public:
     }
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &blendData) const Q_DECL_FINAL;
+    ClipResults doBlend(const QVector<ClipResults> &blendData) const final;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_baseClipId;
     Qt3DCore::QNodeId m_additiveClipId;
diff --git a/src/animation/backend/animationclip_p.h b/src/animation/backend/animationclip_p.h
index 25f5b5cc4..0b8298723 100644
--- a/src/animation/backend/animationclip_p.h
+++ b/src/animation/backend/animationclip_p.h
@@ -103,7 +103,7 @@ public:
 #endif
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void loadAnimationFromUrl();
     void loadAnimationFromData();
     void clearData();
diff --git a/src/animation/backend/blendedclipanimator_p.h b/src/animation/backend/blendedclipanimator_p.h
index f73a00cc3..52ebdcc30 100644
--- a/src/animation/backend/blendedclipanimator_p.h
+++ b/src/animation/backend/blendedclipanimator_p.h
@@ -97,7 +97,7 @@ public:
     void animationClipMarkedDirty() { setDirty(Handler::BlendedClipAnimatorDirty); }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     Qt3DCore::QNodeId m_blendTreeRootId;
     Qt3DCore::QNodeId m_mapperId;
     Qt3DCore::QNodeId m_clockId;
diff --git a/src/animation/backend/channelmapper_p.h b/src/animation/backend/channelmapper_p.h
index 9762ee8f1..cb1a13928 100644
--- a/src/animation/backend/channelmapper_p.h
+++ b/src/animation/backend/channelmapper_p.h
@@ -75,7 +75,7 @@ public:
     QVector<Qt3DCore::QNodeId> mappingIds() const { return m_mappingIds; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_mappingIds;
 };
diff --git a/src/animation/backend/channelmapping_p.h b/src/animation/backend/channelmapping_p.h
index daf6e4148..92c1d1c28 100644
--- a/src/animation/backend/channelmapping_p.h
+++ b/src/animation/backend/channelmapping_p.h
@@ -106,7 +106,7 @@ public:
     MappingType mappingType() const { return m_mappingType; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     // Properties from QChannelMapping
     QString m_channelName;
diff --git a/src/animation/backend/clipanimator_p.h b/src/animation/backend/clipanimator_p.h
index 19cbff7a7..0f975093c 100644
--- a/src/animation/backend/clipanimator_p.h
+++ b/src/animation/backend/clipanimator_p.h
@@ -98,7 +98,7 @@ public:
     void animationClipMarkedDirty() { setDirty(Handler::ClipAnimatorDirty); }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_clipId;
     Qt3DCore::QNodeId m_mapperId;
diff --git a/src/animation/backend/clipblendnode_p.h b/src/animation/backend/clipblendnode_p.h
index 2d243fe0c..9651106f9 100644
--- a/src/animation/backend/clipblendnode_p.h
+++ b/src/animation/backend/clipblendnode_p.h
@@ -110,7 +110,7 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
     {
         if (m_manager->containsNode(change->subjectId()))
             return static_cast<Backend *>(m_manager->lookupNode(change->subjectId()));
@@ -121,12 +121,12 @@ public:
         return backend;
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final
     {
         return m_manager->lookupNode(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    void destroy(Qt3DCore::QNodeId id) const final
     {
         m_manager->releaseNode(id);
     }
diff --git a/src/animation/backend/clipblendvalue_p.h b/src/animation/backend/clipblendvalue_p.h
index a83d33674..f1bdfed3f 100644
--- a/src/animation/backend/clipblendvalue_p.h
+++ b/src/animation/backend/clipblendvalue_p.h
@@ -85,7 +85,7 @@ protected:
     ClipResults doBlend(const QVector<ClipResults> &blendData) const override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_clipId;
 
diff --git a/src/animation/backend/clock_p.h b/src/animation/backend/clock_p.h
index 77f664d33..10987655a 100644
--- a/src/animation/backend/clock_p.h
+++ b/src/animation/backend/clock_p.h
@@ -68,7 +68,7 @@ public:
     double playbackRate() const { return m_playbackRate; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     double m_playbackRate;
 };
diff --git a/src/animation/backend/lerpclipblend_p.h b/src/animation/backend/lerpclipblend_p.h
index ffcaf4186..6120f8afa 100644
--- a/src/animation/backend/lerpclipblend_p.h
+++ b/src/animation/backend/lerpclipblend_p.h
@@ -71,7 +71,7 @@ public:
     inline Qt3DCore::QNodeId endClipId() const { return m_endClipId; }
     void setEndClipId(Qt3DCore::QNodeId endClipId) { m_endClipId = endClipId; }  // For unit tests
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     inline QVector<Qt3DCore::QNodeId> allDependencyIds() const override
     {
@@ -86,10 +86,10 @@ public:
     double duration() const override;
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &blendData) const Q_DECL_FINAL;
+    ClipResults doBlend(const QVector<ClipResults> &blendData) const final;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_startClipId;
     Qt3DCore::QNodeId m_endClipId;
diff --git a/src/animation/backend/nodefunctor_p.h b/src/animation/backend/nodefunctor_p.h
index 5f2bbcc8e..463205e52 100644
--- a/src/animation/backend/nodefunctor_p.h
+++ b/src/animation/backend/nodefunctor_p.h
@@ -71,19 +71,19 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
     {
         Backend *backend = m_manager->getOrCreateResource(change->subjectId());
         backend->setHandler(m_handler);
         return backend;
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    void destroy(Qt3DCore::QNodeId id) const final
     {
         m_manager->releaseResource(id);
     }
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 87f96a178..ef2c07dc0 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -83,7 +83,7 @@ public:
     virtual QAbstractPostman *postman() const = 0;
 };
 
-class QT3DCORE_PRIVATE_EXPORT QChangeArbiter Q_DECL_FINAL
+class QT3DCORE_PRIVATE_EXPORT QChangeArbiter final
         : public QObject
         , public QAbstractArbiter
 {
@@ -112,7 +112,7 @@ public:
     Q_INVOKABLE void setPostman(Qt3DCore::QAbstractPostman *postman);
     Q_INVOKABLE void setScene(Qt3DCore::QScene *scene);
 
-    QAbstractPostman *postman() const Q_DECL_FINAL;
+    QAbstractPostman *postman() const final;
     QScene *scene() const;
 
     static void createUnmanagedThreadLocalChangeQueue(void *changeArbiter);
diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h
index cbc4048ce..ec00c50ae 100644
--- a/src/core/qpostman_p.h
+++ b/src/core/qpostman_p.h
@@ -69,7 +69,7 @@ public:
     virtual bool shouldNotifyFrontend(const QSceneChangePtr &change) = 0;
 };
 
-class Q_AUTOTEST_EXPORT QPostman Q_DECL_FINAL
+class Q_AUTOTEST_EXPORT QPostman final
         : public QObject
         , public QAbstractPostman
 {
@@ -78,10 +78,10 @@ public:
     explicit QPostman(QObject *parent = 0);
     ~QPostman();
 
-    void setScene(QScene *sceneLookup) Q_DECL_FINAL;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_FINAL;
-    void notifyBackend(const QSceneChangePtr &change) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const QSceneChangePtr &e) Q_DECL_FINAL;
+    void setScene(QScene *sceneLookup) final;
+    void sceneChangeEvent(const QSceneChangePtr &e) final;
+    void notifyBackend(const QSceneChangePtr &change) final;
+    bool shouldNotifyFrontend(const QSceneChangePtr &e) final;
 
 public Q_SLOTS:
     void submitChangeBatch();
diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h
index f75c6abc1..30dc2d543 100644
--- a/src/core/services/nullservices_p.h
+++ b/src/core/services/nullservices_p.h
@@ -68,8 +68,8 @@ public:
     {}
     ~NullSystemInformationService() {}
 
-    QStringList aspectNames() const Q_DECL_FINAL { return QStringList(); }
-    int threadPoolThreadCount() const Q_DECL_FINAL { return 0; }
+    QStringList aspectNames() const final { return QStringList(); }
+    int threadPoolThreadCount() const final { return 0; }
 };
 
 
@@ -81,7 +81,7 @@ public:
     {}
     ~NullOpenGLInformationService() {}
 
-    QSurfaceFormat format() const Q_DECL_FINAL { return QSurfaceFormat(); }
+    QSurfaceFormat format() const final { return QSurfaceFormat(); }
 };
 
 } // namespace Qt3DCore
diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp
index 6584c5e24..c4ec79a13 100644
--- a/src/core/services/qeventfilterservice.cpp
+++ b/src/core/services/qeventfilterservice.cpp
@@ -71,7 +71,7 @@ class InternalEventListener : public QObject
     Q_OBJECT
 public:
     explicit InternalEventListener(QEventFilterServicePrivate *filterService, QObject *parent = nullptr);
-    bool eventFilter(QObject *obj, QEvent *e) Q_DECL_FINAL;
+    bool eventFilter(QObject *obj, QEvent *e) final;
     QEventFilterServicePrivate* m_filterService;
 };
 
diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h
index 6f02643f4..18323abb5 100644
--- a/src/core/services/qtickclockservice_p.h
+++ b/src/core/services/qtickclockservice_p.h
@@ -66,9 +66,9 @@ public:
     QTickClockService();
     ~QTickClockService();
 
-    qint64 waitForNextFrame() Q_DECL_FINAL;
-    void start() Q_DECL_FINAL;
-    void stop() Q_DECL_FINAL;
+    qint64 waitForNextFrame() final;
+    void start() final;
+    void stop() final;
 
     Q_DECLARE_PRIVATE(QTickClockService)
 };
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index 3bb68a500..a8899989c 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -405,13 +405,13 @@ public:
 
     ~CuboidVertexBufferFunctor() {}
 
-    QByteArray operator()() Q_DECL_FINAL
+    QByteArray operator()() final
     {
         return createCuboidVertexData(m_xExtent, m_yExtent, m_zExtent,
                                       m_yzFaceResolution, m_xzFaceResolution, m_xyFaceResolution);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const QBufferDataGenerator &other) const final
     {
         const CuboidVertexBufferFunctor *otherFunctor = functor_cast<CuboidVertexBufferFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -448,12 +448,12 @@ public:
 
     ~CuboidIndexBufferFunctor() {}
 
-    QByteArray operator()() Q_DECL_FINAL
+    QByteArray operator()() final
     {
         return createCuboidIndexData(m_yzFaceResolution, m_xzFaceResolution, m_xyFaceResolution);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const QBufferDataGenerator &other) const final
     {
         const CuboidIndexBufferFunctor *otherFunctor = functor_cast<CuboidIndexBufferFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index 14ddb25e6..c6318e199 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -158,12 +158,12 @@ public:
 
     ~PlaneVertexBufferFunctor() {}
 
-    QByteArray operator()() Q_DECL_FINAL
+    QByteArray operator()() final
     {
         return createPlaneVertexData(m_width, m_height, m_resolution, m_mirrored);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const QBufferDataGenerator &other) const final
     {
         const PlaneVertexBufferFunctor *otherFunctor = functor_cast<PlaneVertexBufferFunctor>(&other);
         if (otherFunctor != nullptr)
@@ -192,12 +192,12 @@ public:
 
     ~PlaneIndexBufferFunctor() {}
 
-    QByteArray operator()() Q_DECL_FINAL
+    QByteArray operator()() final
     {
         return createPlaneIndexData(m_resolution);
     }
 
-    bool operator ==(const QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const QBufferDataGenerator &other) const final
     {
         const PlaneIndexBufferFunctor *otherFunctor = functor_cast<PlaneIndexBufferFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/src/input/backend/action_p.h b/src/input/backend/action_p.h
index 6a6a867c2..8fe2759fd 100644
--- a/src/input/backend/action_p.h
+++ b/src/input/backend/action_p.h
@@ -71,7 +71,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_inputs;
     bool m_actionTriggered;
diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h
index 7f297b73b..00fb0475c 100644
--- a/src/input/backend/actioninput_p.h
+++ b/src/input/backend/actioninput_p.h
@@ -74,7 +74,7 @@ public:
     bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<int> m_buttons;
     Qt3DCore::QNodeId m_sourceDevice;
diff --git a/src/input/backend/analogaxisinput_p.h b/src/input/backend/analogaxisinput_p.h
index 640aff709..cd43e7d23 100644
--- a/src/input/backend/analogaxisinput_p.h
+++ b/src/input/backend/analogaxisinput_p.h
@@ -63,15 +63,15 @@ class Q_AUTOTEST_EXPORT AnalogAxisInput : public AbstractAxisInput
 {
 public:
     AnalogAxisInput();
-    void cleanup() Q_DECL_FINAL;
+    void cleanup() final;
 
     inline int axis() const { return m_axis; }
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     float process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     int m_axis;
 };
diff --git a/src/input/backend/axis_p.h b/src/input/backend/axis_p.h
index 73150c522..b83405060 100644
--- a/src/input/backend/axis_p.h
+++ b/src/input/backend/axis_p.h
@@ -71,7 +71,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_inputs;
     float m_axisValue;
diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h
index 246020cb3..bb1a35812 100644
--- a/src/input/backend/axisaccumulator_p.h
+++ b/src/input/backend/axisaccumulator_p.h
@@ -83,7 +83,7 @@ public:
     void stepIntegration(AxisManager *axisManager, float dt);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_sourceAxisId;
     QAxisAccumulator::SourceAxisType m_sourceAxisType;
diff --git a/src/input/backend/axissetting_p.h b/src/input/backend/axissetting_p.h
index c26d3850c..42e1010d5 100644
--- a/src/input/backend/axissetting_p.h
+++ b/src/input/backend/axissetting_p.h
@@ -72,7 +72,7 @@ protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     float m_deadZoneRadius;
     QVector<int> m_axes;
diff --git a/src/input/backend/buttonaxisinput_p.h b/src/input/backend/buttonaxisinput_p.h
index 5ed5b6b52..f47a9b5cc 100644
--- a/src/input/backend/buttonaxisinput_p.h
+++ b/src/input/backend/buttonaxisinput_p.h
@@ -68,7 +68,7 @@ public:
     };
 
     ButtonAxisInput();
-    void cleanup() Q_DECL_FINAL;
+    void cleanup() final;
 
     inline float scale() const { return m_scale; }
     inline QVector<int> buttons() const { return m_buttons; }
@@ -78,13 +78,13 @@ public:
     inline float speedRatio() const { return m_speedRatio; }
     inline qint64 lastUpdateTime() const { return m_lastUpdateTime; }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     float process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
     void updateSpeedRatio(qint64 currentTime, UpdateType type);
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<int> m_buttons;
     float m_scale;
diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h
index f72ad4d94..629e599f2 100644
--- a/src/input/backend/inputbackendnodefunctor_p.h
+++ b/src/input/backend/inputbackendnodefunctor_p.h
@@ -69,18 +69,18 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
     {
         Backend *backend = m_manager->getOrCreateResource(change->subjectId());
         return backend;
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    void destroy(Qt3DCore::QNodeId id) const final
     {
         m_manager->releaseResource(id);
     }
diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h
index 3d3a53c50..efad2c4af 100644
--- a/src/input/backend/inputchord_p.h
+++ b/src/input/backend/inputchord_p.h
@@ -78,7 +78,7 @@ public:
     bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_chords;
     QVector<Qt3DCore::QNodeId> m_inputsToTrigger;
diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h
index b9a577c3e..395021035 100644
--- a/src/input/backend/inputsequence_p.h
+++ b/src/input/backend/inputsequence_p.h
@@ -80,7 +80,7 @@ public:
     bool process(InputHandler *inputHandler, qint64 currentTime) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_sequences;
     QVector<Qt3DCore::QNodeId> m_inputsToTrigger;
diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h
index 05beb5c67..87cb4debf 100644
--- a/src/input/backend/inputsettings_p.h
+++ b/src/input/backend/inputsettings_p.h
@@ -72,7 +72,7 @@ protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QPointer<QObject> m_eventSource;
 };
diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h
index cc1575f2a..317c33792 100644
--- a/src/input/backend/keyboardhandler_p.h
+++ b/src/input/backend/keyboardhandler_p.h
@@ -82,7 +82,7 @@ protected:
     void setSourcerDevice(Qt3DCore::QNodeId device);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     InputHandler *m_inputHandler;
     Qt3DCore::QNodeId m_keyboardDevice;
diff --git a/src/input/backend/keyboardmousegenericdeviceintegration_p.h b/src/input/backend/keyboardmousegenericdeviceintegration_p.h
index c2512f673..dd7c5fc12 100644
--- a/src/input/backend/keyboardmousegenericdeviceintegration_p.h
+++ b/src/input/backend/keyboardmousegenericdeviceintegration_p.h
@@ -68,14 +68,14 @@ public:
     explicit KeyboardMouseGenericDeviceIntegration(InputHandler *handleer);
     ~KeyboardMouseGenericDeviceIntegration();
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_FINAL;
-    QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) Q_DECL_FINAL;
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_FINAL;
-    QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    QStringList deviceNames() const Q_DECL_FINAL;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) final;
+    QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) final;
+    QVector<Qt3DCore::QNodeId> physicalDevices() const final;
+    QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const final;
+    QStringList deviceNames() const final;
 
 private:
-    void onInitialize() Q_DECL_FINAL;
+    void onInitialize() final;
 
     InputHandler *m_handler;
 };
diff --git a/src/input/backend/loadproxydevicejob_p.h b/src/input/backend/loadproxydevicejob_p.h
index 67431f3ae..f9b343b2e 100644
--- a/src/input/backend/loadproxydevicejob_p.h
+++ b/src/input/backend/loadproxydevicejob_p.h
@@ -73,7 +73,7 @@ public:
     InputHandler *inputHandler() const;
     QVector<Qt3DCore::QNodeId> proxies() const;
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 private:
     InputHandler *m_inputHandler;
     QVector<Qt3DCore::QNodeId> m_proxies;
diff --git a/src/input/backend/logicaldevice_p.h b/src/input/backend/logicaldevice_p.h
index e24d7a359..138a54777 100644
--- a/src/input/backend/logicaldevice_p.h
+++ b/src/input/backend/logicaldevice_p.h
@@ -74,7 +74,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_axes;
     QVector<Qt3DCore::QNodeId> m_actions;
@@ -86,9 +86,9 @@ class LogicalDeviceNodeFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit LogicalDeviceNodeFunctor(LogicalDeviceManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     LogicalDeviceManager *m_manager;
diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h
index 510e9c9b5..d49ea2502 100644
--- a/src/input/backend/mousedevice_p.h
+++ b/src/input/backend/mousedevice_p.h
@@ -111,7 +111,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     InputHandler *m_inputHandler;
 
diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h
index 366774005..8abeccfb4 100644
--- a/src/input/backend/mouseeventdispatcherjob_p.h
+++ b/src/input/backend/mouseeventdispatcherjob_p.h
@@ -72,7 +72,7 @@ public:
 #endif
                                                                                                 );
     void setInputHandler(InputHandler *handler);
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h
index 3d32d9864..6d748c068 100644
--- a/src/input/backend/mousehandler_p.h
+++ b/src/input/backend/mousehandler_p.h
@@ -79,7 +79,7 @@ protected:
     void setDevice(Qt3DCore::QNodeId device);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_mouseDevice;
     InputHandler *m_inputHandler;
diff --git a/src/input/backend/physicaldeviceproxy_p.h b/src/input/backend/physicaldeviceproxy_p.h
index 0c714167e..9500a4adb 100644
--- a/src/input/backend/physicaldeviceproxy_p.h
+++ b/src/input/backend/physicaldeviceproxy_p.h
@@ -80,7 +80,7 @@ public:
     Qt3DCore::QNodeId physicalDeviceId() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QString m_deviceName;
     PhysicalDeviceProxyManager *m_manager;
@@ -92,9 +92,9 @@ class PhysicalDeviceProxyNodeFunctor: public Qt3DCore::QBackendNodeMapper
 public:
     explicit PhysicalDeviceProxyNodeFunctor(PhysicalDeviceProxyManager *manager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     PhysicalDeviceProxyManager *m_manager;
diff --git a/src/input/backend/updateaxisactionjob_p.h b/src/input/backend/updateaxisactionjob_p.h
index b65cbec87..719923a50 100644
--- a/src/input/backend/updateaxisactionjob_p.h
+++ b/src/input/backend/updateaxisactionjob_p.h
@@ -72,7 +72,7 @@ class UpdateAxisActionJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit UpdateAxisActionJob(qint64 currentTime, InputHandler *handler, HLogicalDevice handle);
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     void updateAction(LogicalDevice *device);
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index 615fb79b9..b418be5ff 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -62,12 +62,12 @@ public:
 
     QKeyboardHandler *activeInput() const;
 
-    int axisCount() const Q_DECL_FINAL;
-    int buttonCount() const Q_DECL_FINAL;
-    QStringList axisNames() const Q_DECL_FINAL;
-    QStringList buttonNames() const Q_DECL_FINAL;
-    int axisIdentifier(const QString &name) const Q_DECL_FINAL;
-    int buttonIdentifier(const QString &name) const Q_DECL_FINAL;
+    int axisCount() const final;
+    int buttonCount() const final;
+    QStringList axisNames() const final;
+    QStringList buttonNames() const final;
+    int axisIdentifier(const QString &name) const final;
+    int buttonIdentifier(const QString &name) const final;
 
 protected:
     explicit QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = nullptr);
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 1e41843b9..9e6d2c5ac 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -69,12 +69,12 @@ public:
     };
     Q_ENUM(Axis) // LCOV_EXCL_LINE
 
-    int axisCount() const Q_DECL_FINAL;
-    int buttonCount() const Q_DECL_FINAL;
-    QStringList axisNames() const Q_DECL_FINAL;
-    QStringList buttonNames() const Q_DECL_FINAL;
-    int axisIdentifier(const QString &name) const Q_DECL_FINAL;
-    int buttonIdentifier(const QString &name) const Q_DECL_FINAL;
+    int axisCount() const final;
+    int buttonCount() const final;
+    QStringList axisNames() const final;
+    QStringList buttonNames() const final;
+    int axisIdentifier(const QString &name) const final;
+    int buttonIdentifier(const QString &name) const final;
 
     float sensitivity() const;
 
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index beae32f96..91b625ecc 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -74,7 +74,7 @@ protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Manager *m_logicManager;
 };
diff --git a/src/plugins/geometryloaders/default/objgeometryloader.h b/src/plugins/geometryloaders/default/objgeometryloader.h
index 3b9b504df..549a17f6d 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.h
+++ b/src/plugins/geometryloaders/default/objgeometryloader.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
 class ObjGeometryLoader : public BaseGeometryLoader
 {
 protected:
-    bool doLoad(QIODevice *ioDev, const QString &subMesh) Q_DECL_FINAL;
+    bool doLoad(QIODevice *ioDev, const QString &subMesh) final;
 };
 
 } // namespace Qt3DRender
diff --git a/src/plugins/geometryloaders/default/plygeometryloader.h b/src/plugins/geometryloaders/default/plygeometryloader.h
index e044529d4..49c6b858d 100644
--- a/src/plugins/geometryloaders/default/plygeometryloader.h
+++ b/src/plugins/geometryloaders/default/plygeometryloader.h
@@ -115,7 +115,7 @@ public:
     };
 
 protected:
-    bool doLoad(QIODevice *ioDev, const QString &subMesh) Q_DECL_FINAL;
+    bool doLoad(QIODevice *ioDev, const QString &subMesh) final;
 
 private:
     bool parseHeader(QIODevice *ioDev);
diff --git a/src/plugins/geometryloaders/default/stlgeometryloader.h b/src/plugins/geometryloaders/default/stlgeometryloader.h
index 20af85a5d..c9aa5a6f2 100644
--- a/src/plugins/geometryloaders/default/stlgeometryloader.h
+++ b/src/plugins/geometryloaders/default/stlgeometryloader.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
 class StlGeometryLoader : public BaseGeometryLoader
 {
 protected:
-    bool doLoad(QIODevice *ioDev, const QString &subMesh) Q_DECL_FINAL;
+    bool doLoad(QIODevice *ioDev, const QString &subMesh) final;
 
 private:
     bool loadAscii(QIODevice *ioDev);
diff --git a/src/plugins/geometryloaders/fbx/fbxgeometryloader.h b/src/plugins/geometryloaders/fbx/fbxgeometryloader.h
index 69d9670ae..68ee1f976 100644
--- a/src/plugins/geometryloaders/fbx/fbxgeometryloader.h
+++ b/src/plugins/geometryloaders/fbx/fbxgeometryloader.h
@@ -70,9 +70,9 @@ public:
     FbxGeometryLoader();
     ~FbxGeometryLoader();
 
-    QGeometry *geometry() const Q_DECL_FINAL;
+    QGeometry *geometry() const final;
 
-    bool load(QIODevice *ioDev, const QString &subMesh = QString()) Q_DECL_FINAL;
+    bool load(QIODevice *ioDev, const QString &subMesh = QString()) final;
 
 protected:
     void recurseNodes();
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
index 2938829c2..404668dd0 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
@@ -137,9 +137,9 @@ public:
     GLTFGeometryLoader();
     ~GLTFGeometryLoader();
 
-    QGeometry *geometry() const Q_DECL_FINAL;
+    QGeometry *geometry() const final;
 
-    bool load(QIODevice *ioDev, const QString &subMesh = QString()) Q_DECL_FINAL;
+    bool load(QIODevice *ioDev, const QString &subMesh = QString()) final;
 
 protected:
     void setBasePath(const QString &path);
diff --git a/src/plugins/renderplugins/scene2d/scene2dplugin.cpp b/src/plugins/renderplugins/scene2d/scene2dplugin.cpp
index 83e002473..eeb6b5346 100644
--- a/src/plugins/renderplugins/scene2d/scene2dplugin.cpp
+++ b/src/plugins/renderplugins/scene2d/scene2dplugin.cpp
@@ -58,19 +58,19 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
     {
         Backend *backend = m_manager->getOrCreateResource(change->subjectId());
         backend->setRenderer(m_renderer);
         return backend;
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    void destroy(Qt3DCore::QNodeId id) const final
     {
         m_manager->releaseResource(id);
     }
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index ae395a59f..a1558b7e2 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -336,7 +336,7 @@ class AssimpRawTextureImage : public QAbstractTextureImage
 public:
     explicit AssimpRawTextureImage(QNode *parent = 0);
 
-    QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_FINAL;
+    QTextureImageDataGeneratorPtr dataGenerator() const final;
 
     void setData(const QByteArray &data);
 
@@ -348,8 +348,8 @@ private:
     public:
         explicit AssimpRawTextureImageFunctor(const QByteArray &data);
 
-        QTextureImageDataPtr operator()() Q_DECL_FINAL;
-        bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL;
+        QTextureImageDataPtr operator()() final;
+        bool operator ==(const QTextureImageDataGenerator &other) const final;
 
         QT3D_FUNCTOR(AssimpRawTextureImageFunctor)
     private:
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.h b/src/plugins/sceneparsers/gltf/gltfimporter.h
index 8a8e1b3ee..d47a6a729 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.h
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.h
@@ -97,11 +97,11 @@ public:
     bool setJSON( const QJsonDocument &json );
 
     // SceneParserInterface interface
-    void setSource(const QUrl &source) Q_DECL_FINAL;
-    void setData(const QByteArray& data, const QString &basePath) Q_DECL_FINAL;
-    bool areFileTypesSupported(const QStringList &extensions) const Q_DECL_FINAL;
-    Qt3DCore::QEntity *node(const QString &id) Q_DECL_FINAL;
-    Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
+    void setSource(const QUrl &source) final;
+    void setData(const QByteArray& data, const QString &basePath) final;
+    bool areFileTypesSupported(const QStringList &extensions) const final;
+    Qt3DCore::QEntity *node(const QString &id) final;
+    Qt3DCore::QEntity *scene(const QString &id = QString()) final;
 
 private:
     class BufferData
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
index 07d852fd4..fe6977a6e 100644
--- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h
+++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
@@ -91,7 +91,7 @@ public:
     ~GLTFExporter();
 
     bool exportScene(Qt3DCore::QEntity *sceneRoot, const QString &outDir,
-                     const QString &exportName, const QVariantHash &options) Q_DECL_FINAL;
+                     const QString &exportName, const QVariantHash &options) final;
 
     struct GltfOptions {
         bool binaryJson;
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
index df431e452..c096f2a74 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
@@ -72,8 +72,8 @@ public:
     }
 
     QSGTexture *texture() const Q_DECL_NOTHROW { return m_texture; }
-    QSGMaterialType *type() const Q_DECL_FINAL { return &Scene3DSGMaterialShader::type; }
-    QSGMaterialShader *createShader() const Q_DECL_FINAL { return new Scene3DSGMaterialShader(); }
+    QSGMaterialType *type() const final { return &Scene3DSGMaterialShader::type; }
+    QSGMaterialShader *createShader() const final { return new Scene3DSGMaterialShader(); }
 
 private:
     QSGTexture *m_texture;
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
index a1222b07d..c372a1170 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
@@ -61,15 +61,15 @@ class Scene3DSGMaterialShader : public QSGMaterialShader
 {
 public:
     Scene3DSGMaterialShader();
-    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_FINAL;
-    const char * const *attributeNames() const Q_DECL_FINAL;
+    void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final;
+    const char * const *attributeNames() const final;
 
     static QSGMaterialType type;
 
 protected:
-    const char *vertexShader() const Q_DECL_FINAL;
-    const char *fragmentShader() const Q_DECL_FINAL;
-    void initialize() Q_DECL_FINAL;
+    const char *vertexShader() const final;
+    const char *fragmentShader() const final;
+    void initialize() final;
 
 private:
     int m_matrixId;
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 8a9b19024..6caca52bf 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -86,7 +86,7 @@ public:
     }
 
 protected:
-    void statusChanged(Status status) Q_DECL_FINAL
+    void statusChanged(Status status) final
     {
         Quick3DEntityLoaderPrivate *priv = Quick3DEntityLoaderPrivate::get(m_loader);
 
diff --git a/src/render/backend/boundingvolumedebug_p.h b/src/render/backend/boundingvolumedebug_p.h
index f7a1903e9..d4d881ca5 100644
--- a/src/render/backend/boundingvolumedebug_p.h
+++ b/src/render/backend/boundingvolumedebug_p.h
@@ -69,8 +69,8 @@ public:
     ~BoundingVolumeDebug();
 
     void cleanup();
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_FINAL;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void updateFromPeer(Qt3DCore::QNode *peer) final;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     inline bool isRecursive() const { return m_recursive; }
     inline float radius() const { return m_radius; }
diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h
index 7db0e1e93..bcd43cd61 100644
--- a/src/render/backend/cameralens_p.h
+++ b/src/render/backend/cameralens_p.h
@@ -102,7 +102,7 @@ public:
                                     QMatrix4x4 &viewMatrix, QMatrix4x4 &projectionMatrix);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void computeSceneBoundingVolume(Qt3DCore::QNodeId entityId,
                                     Qt3DCore::QNodeId cameraId,
                                     Qt3DCore::QNodeCommand::CommandId commandId);
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index c3d0e9bd0..4ba46d40a 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -174,7 +174,7 @@ public:
 
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     NodeManagers *m_nodeManagers;
     HEntity m_handle;
diff --git a/src/render/backend/levelofdetail_p.h b/src/render/backend/levelofdetail_p.h
index 05f5686bb..4cf835d9b 100644
--- a/src/render/backend/levelofdetail_p.h
+++ b/src/render/backend/levelofdetail_p.h
@@ -73,7 +73,7 @@ public:
     LevelOfDetail();
     ~LevelOfDetail();
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
     Qt3DCore::QNodeId camera() const { return m_camera; }
     int currentIndex() const { return m_currentIndex; }
@@ -86,7 +86,7 @@ public:
     void setCurrentIndex(int currentIndex);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     Qt3DCore::QNodeId m_camera;
     int m_currentIndex;
     QLevelOfDetail::ThresholdType m_thresholdType;
diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h
index 38bbd756c..2c479639f 100644
--- a/src/render/backend/nodefunctor_p.h
+++ b/src/render/backend/nodefunctor_p.h
@@ -72,19 +72,19 @@ public:
     {
     }
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final
     {
         Backend *backend = m_manager->getOrCreateResource(change->subjectId());
         backend->setRenderer(m_renderer);
         return backend;
     }
 
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    void destroy(Qt3DCore::QNodeId id) const final
     {
         m_manager->releaseResource(id);
     }
diff --git a/src/render/backend/rendersettings_p.h b/src/render/backend/rendersettings_p.h
index 381a07429..d2880c134 100644
--- a/src/render/backend/rendersettings_p.h
+++ b/src/render/backend/rendersettings_p.h
@@ -80,7 +80,7 @@ public:
     void setActiveFrameGraphId(Qt3DCore::QNodeId frameGraphNodeId) { m_activeFrameGraph = frameGraphNodeId; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QRenderSettings::RenderPolicy m_renderPolicy;
     QPickingSettings::PickMethod m_pickMethod;
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index d81a8883e..5e3e63582 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -79,7 +79,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_renderOutputs;
 };
diff --git a/src/render/backend/rendertargetoutput_p.h b/src/render/backend/rendertargetoutput_p.h
index fcd4f15e0..20476547b 100644
--- a/src/render/backend/rendertargetoutput_p.h
+++ b/src/render/backend/rendertargetoutput_p.h
@@ -81,7 +81,7 @@ public:
     const Attachment *attachment() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     Qt3DCore::QNodeId m_attachmentUuid;
     Attachment m_attachmentData;
 };
diff --git a/src/render/backend/resourceaccessor_p.h b/src/render/backend/resourceaccessor_p.h
index b4ed2a3eb..10e4abaa9 100644
--- a/src/render/backend/resourceaccessor_p.h
+++ b/src/render/backend/resourceaccessor_p.h
@@ -86,7 +86,7 @@ class QT3DRENDERSHARED_PRIVATE_EXPORT ResourceAccessor : public RenderBackendRes
 {
 public:
     ResourceAccessor(NodeManagers *mgr);
-    bool accessResource(ResourceType type, Qt3DCore::QNodeId nodeId, void **handle, QMutex **lock) Q_DECL_FINAL;
+    bool accessResource(ResourceType type, Qt3DCore::QNodeId nodeId, void **handle, QMutex **lock) final;
 private:
     GLTextureManager *m_glTextureManager;
     TextureManager *m_textureManager;
diff --git a/src/render/backend/transform_p.h b/src/render/backend/transform_p.h
index 8334a5a24..ce026da9d 100644
--- a/src/render/backend/transform_p.h
+++ b/src/render/backend/transform_p.h
@@ -81,7 +81,7 @@ public:
     void updateMatrix();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QMatrix4x4 m_transformMatrix;
     QQuaternion m_rotation;
diff --git a/src/render/backend/triangleboundingvolume_p.h b/src/render/backend/triangleboundingvolume_p.h
index 3192ad456..4735a1522 100644
--- a/src/render/backend/triangleboundingvolume_p.h
+++ b/src/render/backend/triangleboundingvolume_p.h
@@ -77,9 +77,9 @@ public:
                                     const QVector3D &b,
                                     const QVector3D &c);
 
-    Qt3DCore::QNodeId id() const Q_DECL_FINAL;
-    bool intersects(const RayCasting::QRay3D &ray, QVector3D *q, QVector3D *uvw) const Q_DECL_FINAL;
-    Type type() const  Q_DECL_FINAL;
+    Qt3DCore::QNodeId id() const final;
+    bool intersects(const RayCasting::QRay3D &ray, QVector3D *q, QVector3D *uvw) const final;
+    Type type() const  final;
 
     QVector3D a() const;
     QVector3D b() const;
diff --git a/src/render/framegraph/blitframebuffer_p.h b/src/render/framegraph/blitframebuffer_p.h
index c78b20294..796c223ca 100644
--- a/src/render/framegraph/blitframebuffer_p.h
+++ b/src/render/framegraph/blitframebuffer_p.h
@@ -82,7 +82,7 @@ public:
     QBlitFramebuffer::InterpolationMethod interpolationMethod() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_sourceRenderTargetId;
     Qt3DCore::QNodeId m_destinationRenderTargetId;
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index 4fc148316..0e532d68f 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -73,7 +73,7 @@ public:
     Qt3DCore::QNodeId cameraUuid() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_cameraUuid;
 };
diff --git a/src/render/framegraph/clearbuffers_p.h b/src/render/framegraph/clearbuffers_p.h
index 41bfaf89f..e3c56c165 100644
--- a/src/render/framegraph/clearbuffers_p.h
+++ b/src/render/framegraph/clearbuffers_p.h
@@ -87,7 +87,7 @@ public:
     bool clearsAllColorBuffers() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QClearBuffers::BufferType m_type;
     QVector4D m_clearColor;
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 296b50468..aa88a35c5 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -74,7 +74,7 @@ public:
     inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     int m_workGroups[3];
 };
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index cf986e687..18ba4ee7a 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -75,7 +75,7 @@ public:
     QLayerFilter::FilterMode filterMode() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeIdVector m_layerIds;
     QLayerFilter::FilterMode m_filterMode;
diff --git a/src/render/framegraph/memorybarrier_p.h b/src/render/framegraph/memorybarrier_p.h
index e396377e5..e0fd3e9cd 100644
--- a/src/render/framegraph/memorybarrier_p.h
+++ b/src/render/framegraph/memorybarrier_p.h
@@ -70,7 +70,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     QMemoryBarrier::Operations m_waitOperations;
 };
 
diff --git a/src/render/framegraph/proximityfilter_p.h b/src/render/framegraph/proximityfilter_p.h
index 11c9ec63a..e57b53dea 100644
--- a/src/render/framegraph/proximityfilter_p.h
+++ b/src/render/framegraph/proximityfilter_p.h
@@ -76,7 +76,7 @@ public:
 #endif
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     float m_distanceThreshold;
     Qt3DCore::QNodeId m_entityId;
diff --git a/src/render/framegraph/rendercapture_p.h b/src/render/framegraph/rendercapture_p.h
index 8c9f4a31d..71fa01ec1 100644
--- a/src/render/framegraph/rendercapture_p.h
+++ b/src/render/framegraph/rendercapture_p.h
@@ -69,7 +69,7 @@ public:
     void sendRenderCaptures();
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
 private:
 
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index b42d20d58..53cbf9570 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -79,7 +79,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index 030a6f64c..74863aa36 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -76,7 +76,7 @@ public:
     inline float devicePixelRatio() const Q_DECL_NOTHROW { return m_devicePixelRatio; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QSurface *m_surface;
     QSize m_renderTargetSize;
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 7cd4fb7e7..81ac8a3d3 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -72,7 +72,7 @@ public:
     QVector<QRenderTargetOutput::AttachmentPoint> outputs() const { return m_outputs; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_renderTargetUuid;
     QVector<QRenderTargetOutput::AttachmentPoint> m_outputs;
diff --git a/src/render/framegraph/sortpolicy_p.h b/src/render/framegraph/sortpolicy_p.h
index 02e922f0c..ef928af7b 100644
--- a/src/render/framegraph/sortpolicy_p.h
+++ b/src/render/framegraph/sortpolicy_p.h
@@ -70,7 +70,7 @@ public:
     QVector<Qt3DRender::QSortPolicy::SortType> sortTypes() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DRender::QSortPolicy::SortType> m_sortTypes;
 };
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 9102c9a56..d33e118cb 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -74,7 +74,7 @@ protected:
     void removeRenderState(Qt3DCore::QNodeId renderStateId);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     QVector<Qt3DCore::QNodeId> m_renderStates;
 };
 
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index a96a27049..ba5be5852 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -82,7 +82,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     void appendFilter(Qt3DCore::QNodeId criterionId);
     void removeFilter(Qt3DCore::QNodeId criterionId);
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index 1848677b6..f0a1f9b0d 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -87,7 +87,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     float m_xMin;
     float m_yMin;
diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h
index 98398afad..1590b2f29 100644
--- a/src/render/frontend/sphere_p.h
+++ b/src/render/frontend/sphere_p.h
@@ -105,9 +105,9 @@ public:
         return *this;
     }
 
-    Qt3DCore::QNodeId id() const Q_DECL_FINAL;
-    bool intersects(const RayCasting::QRay3D &ray, QVector3D *q, QVector3D *uvw = nullptr) const Q_DECL_FINAL;
-    Type type() const Q_DECL_FINAL;
+    Qt3DCore::QNodeId id() const final;
+    bool intersects(const RayCasting::QRay3D &ray, QVector3D *q, QVector3D *uvw = nullptr) const final;
+    Type type() const final;
 
     static Sphere fromPoints(const QVector<QVector3D> &points);
 
diff --git a/src/render/geometry/armature_p.h b/src/render/geometry/armature_p.h
index 3e2bd748a..3e6e52a3f 100644
--- a/src/render/geometry/armature_p.h
+++ b/src/render/geometry/armature_p.h
@@ -73,7 +73,7 @@ public:
     const UniformValue &skinningPaletteUniform() const { return m_skinningPaletteUniform; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_skeletonId;
     UniformValue m_skinningPaletteUniform;
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index bd395160a..e01537605 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -84,7 +84,7 @@ public:
     void unsetDirty();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_bufferId;
     QString m_name;
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index ac5dc1437..690d1eab6 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -89,7 +89,7 @@ public:
     void unsetDirty();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void forceDataUpload();
 
     QBuffer::BufferType m_type;
diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h
index ea1f7fdb2..b158648ad 100644
--- a/src/render/geometry/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
@@ -76,7 +76,7 @@ public:
     void unsetDirty();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_attributes;
     bool m_geometryDirty;
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 146f49dc2..57d1ca0be 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -98,7 +98,7 @@ public:
     QVector<RayCasting::QBoundingVolume *> triangleData() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_geometryId;
     int m_instanceCount;
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index b1567ab1b..4a14e5c1c 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -120,7 +120,7 @@ public:
 #endif
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void loadSkeletonFromUrl();
     void loadSkeletonFromData();
     Qt3DCore::QJoint *createFrontendJoints(const SkeletonData &skeletonData) const;
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index fe483774f..631f23124 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -81,7 +81,7 @@ public:
     void setStatus(QSceneLoader::Status status);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     SceneManager *m_sceneManager;
     QUrl m_source;
diff --git a/src/render/jobs/filterentitybycomponentjob_p.h b/src/render/jobs/filterentitybycomponentjob_p.h
index 736b77806..dd64e50a7 100644
--- a/src/render/jobs/filterentitybycomponentjob_p.h
+++ b/src/render/jobs/filterentitybycomponentjob_p.h
@@ -80,7 +80,7 @@ public:
     inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
     inline QVector<Entity *> &filteredEntities() Q_DECL_NOTHROW { return m_filteredEntities; }
 
-    void run() Q_DECL_FINAL
+    void run() final
     {
         m_filteredEntities.clear();
         const QVector<HEntity> handles = m_manager->activeHandles();
diff --git a/src/render/jobs/filterlayerentityjob_p.h b/src/render/jobs/filterlayerentityjob_p.h
index 4e4619a25..418f3ff3a 100644
--- a/src/render/jobs/filterlayerentityjob_p.h
+++ b/src/render/jobs/filterlayerentityjob_p.h
@@ -78,7 +78,7 @@ public:
     inline Qt3DCore::QNodeIdVector layerFilters() const { return m_layerFilterIds; }
 
     // QAspectJob interface
-    void run() Q_DECL_FINAL;
+    void run() final;
 
     void filterAcceptAnyMatchingLayers(Entity *entity, const Qt3DCore::QNodeIdVector &layerIds);
     void filterAcceptAllMatchingLayers(Entity *entity, const Qt3DCore::QNodeIdVector &layerIds);
diff --git a/src/render/jobs/filterproximitydistancejob_p.h b/src/render/jobs/filterproximitydistancejob_p.h
index 50b5f6f55..935d4036f 100644
--- a/src/render/jobs/filterproximitydistancejob_p.h
+++ b/src/render/jobs/filterproximitydistancejob_p.h
@@ -62,7 +62,7 @@ public:
     inline bool hasProximityFilter() const { return !m_proximityFilterIds.empty(); }
 
     // QAspectJob interface
-    void run() Q_DECL_FINAL;
+    void run() final;
     QVector<Entity *> filteredEntities() const { return m_filteredEntities; }
 
 #if defined (QT_BUILD_INTERNAL)
diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h
index bf5849f5a..e3700fedc 100644
--- a/src/render/jobs/framecleanupjob_p.h
+++ b/src/render/jobs/framecleanupjob_p.h
@@ -74,7 +74,7 @@ public:
     void setManagers(NodeManagers *managers);
 
 protected:
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/jobs/frustumcullingjob_p.h b/src/render/jobs/frustumcullingjob_p.h
index ebd870937..8b0bc7150 100644
--- a/src/render/jobs/frustumcullingjob_p.h
+++ b/src/render/jobs/frustumcullingjob_p.h
@@ -77,7 +77,7 @@ public:
 
     QVector<Entity *> visibleEntities() const Q_DECL_NOTHROW { return m_visibleEntities; }
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     void cullScene(Entity *e, const Plane *planes);
diff --git a/src/render/jobs/genericlambdajob_p.h b/src/render/jobs/genericlambdajob_p.h
index aa2fa3430..d72975761 100644
--- a/src/render/jobs/genericlambdajob_p.h
+++ b/src/render/jobs/genericlambdajob_p.h
@@ -72,7 +72,7 @@ public:
     }
 
     // QAspectJob interface
-    void run() Q_DECL_FINAL
+    void run() final
     {
         m_callable();
     }
diff --git a/src/render/jobs/lightgatherer_p.h b/src/render/jobs/lightgatherer_p.h
index 4eaeb8f19..d0090ccd0 100644
--- a/src/render/jobs/lightgatherer_p.h
+++ b/src/render/jobs/lightgatherer_p.h
@@ -77,7 +77,7 @@ public:
         return envLight;
     }
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     EntityManager *m_manager;
diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index 36fdd950b..607068712 100644
--- a/src/render/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
@@ -74,7 +74,7 @@ public:
     inline void setNodeManagers(NodeManagers *manager) { m_manager = manager; }
 
 protected:
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     QTextureGeneratorPtr m_texGen;
diff --git a/src/render/jobs/materialparametergathererjob_p.h b/src/render/jobs/materialparametergathererjob_p.h
index 9a7af1f16..e334d5b8a 100644
--- a/src/render/jobs/materialparametergathererjob_p.h
+++ b/src/render/jobs/materialparametergathererjob_p.h
@@ -85,7 +85,7 @@ public:
     inline TechniqueFilter *techniqueFilter() const Q_DECL_NOTHROW { return m_techniqueFilter; }
     inline RenderPassFilter *renderPassFilter() const Q_DECL_NOTHROW { return m_renderPassFilter; }
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     NodeManagers *m_manager;
diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h
index d3f270d35..da1a8f040 100644
--- a/src/render/jobs/pickboundingvolumejob_p.h
+++ b/src/render/jobs/pickboundingvolumejob_p.h
@@ -104,7 +104,7 @@ public:
     bool runHelper();
 
 protected:
-    void run() Q_DECL_FINAL;
+    void run() final;
     void dispatchPickEvents(const QMouseEvent &event,
                             const PickingUtils::HitList &sphereHits,
                             QPickEvent::Buttons eventButton,
diff --git a/src/render/jobs/renderviewbuilderjob_p.h b/src/render/jobs/renderviewbuilderjob_p.h
index 655b5d8a1..c38f788b0 100644
--- a/src/render/jobs/renderviewbuilderjob_p.h
+++ b/src/render/jobs/renderviewbuilderjob_p.h
@@ -75,7 +75,7 @@ public:
     inline void setRenderables(const QVector<Entity *> &renderables) Q_DECL_NOTHROW { m_renderables = renderables; }
     QVector<RenderCommand *> &commands() Q_DECL_NOTHROW { return m_commands; }
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     RenderView *m_renderView;
diff --git a/src/render/jobs/sendbuffercapturejob_p.h b/src/render/jobs/sendbuffercapturejob_p.h
index d01ecec72..c22056a1c 100644
--- a/src/render/jobs/sendbuffercapturejob_p.h
+++ b/src/render/jobs/sendbuffercapturejob_p.h
@@ -78,7 +78,7 @@ public:
 
     void addRequest(QPair<Buffer*, QByteArray> request);
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/jobs/sendrendercapturejob_p.h b/src/render/jobs/sendrendercapturejob_p.h
index a6a7f7e79..4ca54b483 100644
--- a/src/render/jobs/sendrendercapturejob_p.h
+++ b/src/render/jobs/sendrendercapturejob_p.h
@@ -71,7 +71,7 @@ public:
 
     void setManagers(NodeManagers *managers);
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     Renderer *m_renderer;
diff --git a/src/render/jobs/updatelevelofdetailjob_p.h b/src/render/jobs/updatelevelofdetailjob_p.h
index c29501a09..02967458b 100644
--- a/src/render/jobs/updatelevelofdetailjob_p.h
+++ b/src/render/jobs/updatelevelofdetailjob_p.h
@@ -75,7 +75,7 @@ public:
     void setManagers(NodeManagers *manager);
     void setFrameGraphRoot(FrameGraphNode *frameGraphRoot);
     void setRoot(Entity *root);
-    void run() Q_DECL_FINAL;
+    void run() final;
 
     NodeManagers *managers() const { return m_manager; }
     Entity *root() const { return m_root; }
diff --git a/src/render/jobs/updatemeshtrianglelistjob_p.h b/src/render/jobs/updatemeshtrianglelistjob_p.h
index 9c0383739..9b67b9f49 100644
--- a/src/render/jobs/updatemeshtrianglelistjob_p.h
+++ b/src/render/jobs/updatemeshtrianglelistjob_p.h
@@ -69,7 +69,7 @@ public:
     ~UpdateMeshTriangleListJob();
 
     void setManagers(NodeManagers *manager);
-    void run() Q_DECL_FINAL;
+    void run() final;
 
     NodeManagers *managers() const;
 
diff --git a/src/render/jobs/updateshaderdatatransformjob_p.h b/src/render/jobs/updateshaderdatatransformjob_p.h
index 6fe365b6b..2fc06b8f7 100644
--- a/src/render/jobs/updateshaderdatatransformjob_p.h
+++ b/src/render/jobs/updateshaderdatatransformjob_p.h
@@ -71,7 +71,7 @@ public:
     void setManagers(NodeManagers *manager);
     NodeManagers *managers() const;
 
-    void run() Q_DECL_FINAL;
+    void run() final;
 
 private:
     NodeManagers *m_manager;
diff --git a/src/render/lights/environmentlight_p.h b/src/render/lights/environmentlight_p.h
index 2ebe72b12..00d49d298 100644
--- a/src/render/lights/environmentlight_p.h
+++ b/src/render/lights/environmentlight_p.h
@@ -65,7 +65,7 @@ public:
     Qt3DCore::QNodeId shaderData() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_shaderDataId;
 };
diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h
index e1f552b2e..8ecc87585 100644
--- a/src/render/lights/light_p.h
+++ b/src/render/lights/light_p.h
@@ -67,7 +67,7 @@ public:
     Qt3DCore::QNodeId shaderData() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_shaderDataId;
 };
@@ -78,8 +78,8 @@ public:
     explicit RenderLightFunctor(AbstractRenderer *renderer, NodeManagers *managers);
 
     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;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index fbb5f866a..87ff4a803 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -77,7 +77,7 @@ public:
     QVector<Qt3DCore::QNodeId> parameters() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<Qt3DCore::QNodeId> m_techniques;
     ParameterPack m_parameterPack;
diff --git a/src/render/materialsystem/filterkey_p.h b/src/render/materialsystem/filterkey_p.h
index 497002e34..69d298503 100644
--- a/src/render/materialsystem/filterkey_p.h
+++ b/src/render/materialsystem/filterkey_p.h
@@ -76,7 +76,7 @@ public:
     bool operator !=(const FilterKey &other);
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVariant m_value;
     QString m_name;
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index a80d62af9..3b55dc657 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -85,7 +85,7 @@ public:
     Qt3DCore::QNodeId effect() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     ParameterPack m_parameterPack;
     Qt3DCore::QNodeId m_effectUuid;
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 744db06d3..4ab04bc8e 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -78,7 +78,7 @@ public:
     const UniformValue &uniformValue() const { return m_uniformValue; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QString m_name;
     UniformValue m_uniformValue;
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index f14895322..1ca02b1ad 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -95,7 +95,7 @@ private:
     void addRenderState(Qt3DCore::QNodeId renderStateId);
     void removeRenderState(Qt3DCore::QNodeId renderStateId);
 
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     Qt3DCore::QNodeId m_shaderUuid;
     QVector<Qt3DCore::QNodeId> m_filterKeyList;
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 06c38ed43..9eb24904c 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -126,7 +126,7 @@ public:
     inline bool hasPendingNotifications() const { return !m_pendingNotifications.empty(); }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     QVector<QString> m_uniformsNames;
     QVector<int> m_uniformsNamesIds;
diff --git a/src/render/materialsystem/shaderbuilder_p.h b/src/render/materialsystem/shaderbuilder_p.h
index 6a90c969e..b76c8389f 100644
--- a/src/render/materialsystem/shaderbuilder_p.h
+++ b/src/render/materialsystem/shaderbuilder_p.h
@@ -98,7 +98,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void setEnabledLayers(const QStringList &layers);
 
     GraphicsApiFilterData m_graphicsApi;
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index 2b053032c..168335f63 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -130,9 +130,9 @@ class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeMapper
 public:
     explicit RenderShaderDataFunctor(AbstractRenderer *renderer, NodeManagers *managers);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index b94b2da60..0ca9d3ae9 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -102,7 +102,7 @@ public:
     NodeManagers *nodeManager() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     GraphicsApiFilterData m_graphicsApiFilterData;
     ParameterPack m_parameterPack;
diff --git a/src/render/picking/objectpicker_p.h b/src/render/picking/objectpicker_p.h
index 2c2cc361e..b9c308afb 100644
--- a/src/render/picking/objectpicker_p.h
+++ b/src/render/picking/objectpicker_p.h
@@ -69,7 +69,7 @@ public:
     ~ObjectPicker();
 
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
     bool isPressed() const;
     bool isHoverEnabled() const;
     bool isDragEnabled() const;
@@ -82,7 +82,7 @@ public:
     void onExited();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
     void notifyJob();
 
     bool m_isPressed;
diff --git a/src/render/picking/pickeventfilter_p.h b/src/render/picking/pickeventfilter_p.h
index fc4b00ddc..c4ede4681 100644
--- a/src/render/picking/pickeventfilter_p.h
+++ b/src/render/picking/pickeventfilter_p.h
@@ -73,7 +73,7 @@ public:
     QList<QKeyEvent> pendingKeyEvents();
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *e) Q_DECL_FINAL;
+    bool eventFilter(QObject *obj, QEvent *e) final;
 
 private:
     QList<QMouseEvent> m_pendingMouseEvents;
diff --git a/src/render/renderstates/renderstatenode_p.h b/src/render/renderstates/renderstatenode_p.h
index 97a2d5e4d..886bb0c95 100644
--- a/src/render/renderstates/renderstatenode_p.h
+++ b/src/render/renderstates/renderstatenode_p.h
@@ -72,7 +72,7 @@ protected:
     void cleanup();
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     StateVariant m_impl;
 };
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h
index 82ba084e3..c85606f87 100644
--- a/src/render/renderstates/renderstates_p.h
+++ b/src/render/renderstates/renderstates_p.h
@@ -159,14 +159,14 @@ public:
 class Q_AUTOTEST_EXPORT ColorMask : public GenericState<ColorMask, ColorStateMask, GLboolean, GLboolean, GLboolean, GLboolean>
 {
 public:
-    void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+    void apply(GraphicsContext *gc) const final;
     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 apply(GraphicsContext *gc) const final;
     void updateProperty(const char *name, const QVariant &value) override;
 };
 
@@ -179,21 +179,21 @@ public:
 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 apply(GraphicsContext *gc) const final;
     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 apply(GraphicsContext *gc) const final;
     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 apply(GraphicsContext *gc) const final;
     void updateProperty(const char *name, const QVariant &value) override;
 };
 
diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp
index 880985aea..8749a54ab 100644
--- a/src/render/services/vsyncframeadvanceservice.cpp
+++ b/src/render/services/vsyncframeadvanceservice.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceServicePrivate
+class VSyncFrameAdvanceServicePrivate final : public Qt3DCore::QAbstractFrameAdvanceServicePrivate
 {
 public:
     explicit VSyncFrameAdvanceServicePrivate(bool drivenByRenderThread)
diff --git a/src/render/services/vsyncframeadvanceservice_p.h b/src/render/services/vsyncframeadvanceservice_p.h
index f33d41b98..c57c81a79 100644
--- a/src/render/services/vsyncframeadvanceservice_p.h
+++ b/src/render/services/vsyncframeadvanceservice_p.h
@@ -61,15 +61,15 @@ namespace Render {
 
 class VSyncFrameAdvanceServicePrivate;
 
-class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceService
+class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService final : public Qt3DCore::QAbstractFrameAdvanceService
 {
 public:
     explicit VSyncFrameAdvanceService(bool drivenByRenderThread);
     ~VSyncFrameAdvanceService();
 
-    qint64 waitForNextFrame() Q_DECL_FINAL;
-    void start() Q_DECL_FINAL;
-    void stop() Q_DECL_FINAL;
+    qint64 waitForNextFrame() final;
+    void start() final;
+    void stop() final;
 
     void proceedToNextFrame();
 
diff --git a/src/render/texture/qpaintedtextureimage_p.h b/src/render/texture/qpaintedtextureimage_p.h
index 9db2f4d9c..93705d96e 100644
--- a/src/render/texture/qpaintedtextureimage_p.h
+++ b/src/render/texture/qpaintedtextureimage_p.h
@@ -89,8 +89,8 @@ public:
     ~QPaintedTextureImageDataGenerator();
 
     // Will be executed from within a QAspectJob
-    QTextureImageDataPtr operator ()() Q_DECL_FINAL;
-    bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL;
+    QTextureImageDataPtr operator ()() final;
+    bool operator ==(const QTextureImageDataGenerator &other) const final;
 
     QT3D_FUNCTOR(QPaintedTextureImageDataGenerator)
 
diff --git a/src/render/texture/qtextureimage_p.h b/src/render/texture/qtextureimage_p.h
index 8db8f50f0..5a4ea8f5a 100644
--- a/src/render/texture/qtextureimage_p.h
+++ b/src/render/texture/qtextureimage_p.h
@@ -85,8 +85,8 @@ class Q_AUTOTEST_EXPORT QImageTextureDataFunctor : public QTextureImageDataGener
 public:
     explicit QImageTextureDataFunctor(const QUrl &url, bool mirrored);
     // Will be executed from within a QAspectJob
-    QTextureImageDataPtr operator ()() Q_DECL_FINAL;
-    bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL;
+    QTextureImageDataPtr operator ()() final;
+    bool operator ==(const QTextureImageDataGenerator &other) const final;
     inline QTextureImage::Status status() const { return m_status; }
     QT3D_FUNCTOR(QImageTextureDataFunctor)
 
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index ec7717d6d..2c71eb10a 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -162,7 +162,7 @@ public:
 
     bool isValid() const;
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     DirtyFlags m_dirty;
     TextureProperties m_properties;
@@ -181,9 +181,9 @@ public:
     explicit TextureFunctor(AbstractRenderer *renderer,
                             TextureManager *textureNodeManager,
                             TextureImageManager *textureImageManager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     AbstractRenderer *m_renderer;
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 19cc95a61..e898b2f1a 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -88,7 +88,7 @@ public:
     inline QTextureImageDataGeneratorPtr dataGenerator() const { return m_generator; }
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
     int m_layer;
     int m_mipLevel;
@@ -106,9 +106,9 @@ public:
                                  TextureManager *textureManager,
                                  TextureImageManager *textureImageManager);
 
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const final;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const final;
+    void destroy(Qt3DCore::QNodeId id) const final;
 
 private:
     AbstractRenderer *m_renderer;
diff --git a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index d51e64925..462c02518 100644
--- a/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -55,17 +55,17 @@ public:
         return currentDependencyIds();
     }
 
-    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const final
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
     using ClipBlendNode::setClipResults;
 
-    double duration() const Q_DECL_FINAL { return m_duration; }
+    double duration() const final { return m_duration; }
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &) const Q_DECL_FINAL { return ClipResults(); }
+    ClipResults doBlend(const QVector<ClipResults> &) const final { return ClipResults(); }
 
 private:
     double m_duration;
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp
index ec311713c..c75ae8e6a 100644
--- a/tests/auto/animation/animationutils/tst_animationutils.cpp
+++ b/tests/auto/animation/animationutils/tst_animationutils.cpp
@@ -86,17 +86,17 @@ public:
         return currentDependencyIds();
     }
 
-    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const final
     {
         return QVector<Qt3DCore::QNodeId>() << m_value1Id << m_value2Id;
     }
 
     using ClipBlendNode::setClipResults;
 
-    double duration() const Q_DECL_FINAL { return 0.0f; }
+    double duration() const final { return 0.0f; }
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &blendData) const Q_DECL_FINAL
+    ClipResults doBlend(const QVector<ClipResults> &blendData) const final
     {
         Q_ASSERT(blendData.size() == 2);
         const int elementCount = blendData.first().size();
diff --git a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
index 6e24624b6..dab6e698d 100644
--- a/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
+++ b/tests/auto/animation/clipblendnode/tst_clipblendnode.cpp
@@ -59,17 +59,17 @@ public:
         return currentDependencyIds();
     }
 
-    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const final
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
     using ClipBlendNode::setClipResults;
 
-    double duration() const Q_DECL_FINAL { return 0.0f; }
+    double duration() const final { return 0.0f; }
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &) const Q_DECL_FINAL
+    ClipResults doBlend(const QVector<ClipResults> &) const final
     {
         return m_clipResults;
     }
diff --git a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
index 5b35fd349..489a2f019 100644
--- a/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
+++ b/tests/auto/animation/clipblendnodemanager/tst_clipblendnodemanager.cpp
@@ -54,15 +54,15 @@ public:
         return currentDependencyIds();
     }
 
-    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const final
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
-    double duration() const Q_DECL_FINAL { return 0.0f; }
+    double duration() const final { return 0.0f; }
 
 protected:
-    Qt3DAnimation::Animation::ClipResults doBlend(const QVector<Qt3DAnimation::Animation::ClipResults> &) const Q_DECL_FINAL
+    Qt3DAnimation::Animation::ClipResults doBlend(const QVector<Qt3DAnimation::Animation::ClipResults> &) const final
     {
         return Qt3DAnimation::Animation::ClipResults();
     }
diff --git a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
index 7379431f7..e75c4f2f8 100644
--- a/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
+++ b/tests/auto/animation/lerpclipblend/tst_lerpclipblend.cpp
@@ -55,17 +55,17 @@ public:
         return currentDependencyIds();
     }
 
-    QVector<Qt3DCore::QNodeId> currentDependencyIds() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> currentDependencyIds() const final
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
     using ClipBlendNode::setClipResults;
 
-    double duration() const Q_DECL_FINAL { return m_duration; }
+    double duration() const final { return m_duration; }
 
 protected:
-    ClipResults doBlend(const QVector<ClipResults> &) const Q_DECL_FINAL { return ClipResults(); }
+    ClipResults doBlend(const QVector<ClipResults> &) const final { return ClipResults(); }
 
 private:
     double m_duration;
diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h
index 731f16f0f..7d7e4e49b 100644
--- a/tests/auto/core/common/testpostmanarbiter.h
+++ b/tests/auto/core/common/testpostmanarbiter.h
@@ -42,10 +42,10 @@ class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     explicit TestPostman(TestArbiter *arbiter);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL;
-    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL;
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) final;
+    void setScene(Qt3DCore::QScene *) final;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) final;
+    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) final;
 
 private:
     TestArbiter *m_arbiter;
@@ -57,13 +57,13 @@ public:
     TestArbiter();
     ~TestArbiter();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) final;
 
-    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL;
+    Qt3DCore::QAbstractPostman *postman() const final;
 
     QVector<Qt3DCore::QSceneChangePtr> events;
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 1e1b1a3aa..6dcd1bd13 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -104,10 +104,10 @@ public:
         : m_spy(spy)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL {};
-    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL {};
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &changee) Q_DECL_FINAL { Q_UNUSED(changee); return false; }
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) final {};
+    void setScene(Qt3DCore::QScene *) final {};
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &change) final;
+    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &changee) final { Q_UNUSED(changee); return false; }
 
 private:
     ObserverSpy *m_spy;
@@ -155,7 +155,7 @@ public:
         events << ChangeRecord(e, false);
     }
 
-    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const final
     {
         return m_postman.data();
     }
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index cf7874a5c..4beb28bc2 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -301,7 +301,7 @@ public:
         , m_allowFrontendNotifications(false)
     {}
 
-    void setScene(Qt3DCore::QScene *scene) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *scene) final
     {
         m_sceneInterface = scene;
     }
@@ -334,7 +334,7 @@ public:
         return m_lastChanges;
     }
 
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) final
     {
         m_sceneInterface->arbiter()->sceneChangeEventWithLock(e);
     }
diff --git a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
index 24d9cce68..cde9834b4 100644
--- a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
+++ b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
@@ -55,8 +55,8 @@ public:
         : QSystemInformationService(QStringLiteral("Dummy System Information Service"))
     {}
 
-    QStringList aspectNames() const Q_DECL_FINAL { return QStringList(); }
-    int threadPoolThreadCount() const Q_DECL_FINAL { return 4; }
+    QStringList aspectNames() const final { return QStringList(); }
+    int threadPoolThreadCount() const final { return 4; }
 };
 
 
diff --git a/tests/auto/coretest/testpostmanarbiter_p.h b/tests/auto/coretest/testpostmanarbiter_p.h
index 7785b864a..26c0cbc67 100644
--- a/tests/auto/coretest/testpostmanarbiter_p.h
+++ b/tests/auto/coretest/testpostmanarbiter_p.h
@@ -56,10 +56,10 @@ class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     explicit TestPostman(TestArbiter *arbiter);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL;
-    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL;
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) final;
+    void setScene(Qt3DCore::QScene *) final;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) final;
+    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) final;
 
 private:
     TestArbiter *m_arbiter;
@@ -71,13 +71,13 @@ public:
     TestArbiter();
     ~TestArbiter();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) final;
 
-    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL;
+    Qt3DCore::QAbstractPostman *postman() const final;
 
     QVector<Qt3DCore::QSceneChangePtr> events;
 
diff --git a/tests/auto/input/commons/testdevice.h b/tests/auto/input/commons/testdevice.h
index 52750029e..936a0d1b2 100644
--- a/tests/auto/input/commons/testdevice.h
+++ b/tests/auto/input/commons/testdevice.h
@@ -43,12 +43,12 @@ public:
         : Qt3DInput::QAbstractPhysicalDevice(parent)
     {}
 
-    int axisCount() const Q_DECL_FINAL { return 0; }
-    int buttonCount() const Q_DECL_FINAL { return 0; }
-    QStringList axisNames() const Q_DECL_FINAL { return QStringList(); }
-    QStringList buttonNames() const Q_DECL_FINAL { return QStringList(); }
-    int axisIdentifier(const QString &name) const Q_DECL_FINAL { Q_UNUSED(name) return 0; }
-    int buttonIdentifier(const QString &name) const Q_DECL_FINAL { Q_UNUSED(name) return 0; }
+    int axisCount() const final { return 0; }
+    int buttonCount() const final { return 0; }
+    QStringList axisNames() const final { return QStringList(); }
+    QStringList buttonNames() const final { return QStringList(); }
+    int axisIdentifier(const QString &name) const final { Q_UNUSED(name) return 0; }
+    int buttonIdentifier(const QString &name) const final { Q_UNUSED(name) return 0; }
 
 private:
     friend class TestDeviceBackendNode;
@@ -63,7 +63,7 @@ public:
         Qt3DCore::QBackendNodeTester().simulateInitialization(device, this);
     }
 
-    float axisValue(int axisIdentifier) const Q_DECL_FINAL
+    float axisValue(int axisIdentifier) const final
     {
         return m_axisValues.value(axisIdentifier);
     }
@@ -73,7 +73,7 @@ public:
         m_axisValues.insert(axisIdentifier, value);
     }
 
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_FINAL
+    bool isButtonPressed(int buttonIdentifier) const final
     {
         return m_buttonStates.value(buttonIdentifier);
     }
@@ -103,13 +103,13 @@ public:
         qDeleteAll(m_deviceBackendNodes);
     }
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_FINAL
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) final
     {
         Q_UNUSED(time);
         return QVector<Qt3DCore::QAspectJobPtr>();
     }
 
-    TestDevice *createPhysicalDevice(const QString &name) Q_DECL_FINAL
+    TestDevice *createPhysicalDevice(const QString &name) final
     {
         Q_ASSERT(!deviceNames().contains(name));
         auto device = new TestDevice(m_devicesParent.data()); // Avoids unwanted reparenting
@@ -119,7 +119,7 @@ public:
         return device;
     }
 
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_FINAL
+    QVector<Qt3DCore::QNodeId> physicalDevices() const final
     {
         QVector<Qt3DCore::QNodeId> ids;
         std::transform(m_devices.constBegin(), m_devices.constEnd(),
@@ -128,7 +128,7 @@ public:
         return ids;
     }
 
-    TestDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const Q_DECL_FINAL
+    TestDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId id) const final
     {
         auto it = std::find_if(m_deviceBackendNodes.constBegin(), m_deviceBackendNodes.constEnd(),
                                [id] (TestDeviceBackendNode *node) { return node->peerId() == id; });
@@ -138,7 +138,7 @@ public:
             return *it;
     }
 
-    QStringList deviceNames() const Q_DECL_FINAL
+    QStringList deviceNames() const final
     {
         QStringList names;
         std::transform(m_devices.constBegin(), m_devices.constEnd(),
@@ -148,7 +148,7 @@ public:
     }
 
 private:
-    void onInitialize() Q_DECL_FINAL {}
+    void onInitialize() final {}
 
     QScopedPointer<Qt3DCore::QNode> m_devicesParent;
     QVector<TestDevice*> m_devices;
diff --git a/tests/auto/input/commons/testdeviceproxy.h b/tests/auto/input/commons/testdeviceproxy.h
index 366f40958..13e10d501 100644
--- a/tests/auto/input/commons/testdeviceproxy.h
+++ b/tests/auto/input/commons/testdeviceproxy.h
@@ -56,12 +56,12 @@ public:
         Right
     };
 
-    int axisCount() const Q_DECL_FINAL { return 3; }
-    int buttonCount() const Q_DECL_FINAL { return 2; }
-    QStringList axisNames() const Q_DECL_FINAL { return QStringList() << QStringLiteral("x") << QStringLiteral("y") << QStringLiteral("z"); }
-    QStringList buttonNames() const Q_DECL_FINAL { return QStringList() << QStringLiteral("Left") << QStringLiteral("Right"); }
+    int axisCount() const final { return 3; }
+    int buttonCount() const final { return 2; }
+    QStringList axisNames() const final { return QStringList() << QStringLiteral("x") << QStringLiteral("y") << QStringLiteral("z"); }
+    QStringList buttonNames() const final { return QStringList() << QStringLiteral("Left") << QStringLiteral("Right"); }
 
-    int axisIdentifier(const QString &name) const Q_DECL_FINAL
+    int axisIdentifier(const QString &name) const final
     {
         if (name == QLatin1String("x"))
             return TestPhysicalDevice::X;
@@ -71,7 +71,7 @@ public:
             return TestPhysicalDevice::Z;
         return -1;
     }
-    int buttonIdentifier(const QString &name) const Q_DECL_FINAL
+    int buttonIdentifier(const QString &name) const final
     {
         if (name == QLatin1String("Left"))
             return TestPhysicalDevice::Left;
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index 7af342264..84990f4ab 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -43,12 +43,12 @@ public:
         : m_size(size)
     {}
 
-    QByteArray operator ()() Q_DECL_FINAL
+    QByteArray operator ()() final
     {
         return QByteArrayLiteral("454");
     }
 
-    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const final
     {
         const TestFunctor *otherFunctor = Qt3DRender::functor_cast<TestFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index af074def0..d07ec9914 100644
--- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -44,12 +44,12 @@ public:
         : m_size(size)
     {}
 
-    Qt3DRender::QGeometry *operator ()() Q_DECL_FINAL
+    Qt3DRender::QGeometry *operator ()() final
     {
         return nullptr;
     }
 
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_FINAL
+    bool operator ==(const Qt3DRender::QGeometryFactory &other) const final
     {
         const TestFactory *otherFactory = Qt3DRender::functor_cast<TestFactory>(&other);
         if (otherFactory != nullptr)
diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp
index b4aa39545..47027bf56 100644
--- a/tests/auto/render/picking/tst_picking.cpp
+++ b/tests/auto/render/picking/tst_picking.cpp
@@ -54,7 +54,7 @@ public:
         : Qt3DRender::QObjectPicker(parent)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) final
     {
         Qt3DRender::QObjectPicker::sceneChangeEvent(change);
     }
diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
index 5a37d98a1..7fcd3fadc 100644
--- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
+++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp
@@ -45,7 +45,7 @@ public:
         : Qt3DRender::QBoundingVolumeDebug(parent)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) final
     {
         Qt3DRender::QBoundingVolumeDebug::sceneChangeEvent(change);
     }
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index fdc25cbca..5408c0474 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -44,12 +44,12 @@ public:
         : m_size(size)
     {}
 
-    QByteArray operator ()() Q_DECL_FINAL
+    QByteArray operator ()() final
     {
         return QByteArray();
     }
 
-    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const Q_DECL_FINAL
+    bool operator ==(const Qt3DRender::QBufferDataGenerator &other) const final
     {
         const TestFunctor *otherFunctor = Qt3DRender::functor_cast<TestFunctor>(&other);
         if (otherFunctor != nullptr)
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index edd767ad9..221d0f880 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -51,12 +51,12 @@ public:
         : m_size(size)
     {}
 
-    Qt3DRender::QGeometry *operator ()() Q_DECL_FINAL
+    Qt3DRender::QGeometry *operator ()() final
     {
         return nullptr;
     }
 
-    bool operator ==(const Qt3DRender::QGeometryFactory &other) const Q_DECL_FINAL
+    bool operator ==(const Qt3DRender::QGeometryFactory &other) const final
     {
         const TestFactory *otherFactory = Qt3DRender::functor_cast<TestFactory>(&other);
         if (otherFactory != nullptr)
diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
index 4397954ec..6714d8a06 100644
--- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
+++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp
@@ -43,7 +43,7 @@ public:
         : Qt3DRender::QObjectPicker(parent)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) final
     {
         Qt3DRender::QObjectPicker::sceneChangeEvent(change);
     }
diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
index 830615a95..b2144d500 100644
--- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
+++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
@@ -44,7 +44,7 @@ public:
         : Qt3DRender::QRenderCapture(parent)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) final
     {
         Qt3DRender::QRenderCapture::sceneChangeEvent(change);
     }
diff --git a/tests/auto/render/renderqueue/tst_renderqueue.cpp b/tests/auto/render/renderqueue/tst_renderqueue.cpp
index 163a699c1..071f9b3a5 100644
--- a/tests/auto/render/renderqueue/tst_renderqueue.cpp
+++ b/tests/auto/render/renderqueue/tst_renderqueue.cpp
@@ -148,7 +148,7 @@ public:
 
 public Q_SLOTS:
 
-    void run() Q_DECL_FINAL // In Thread
+    void run() final // In Thread
     {
         for (int i = 0; i < 5; i++) {
             m_waitQueue.acquire();
diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
index c35473111..1238f1800 100644
--- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
+++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
@@ -30,7 +30,7 @@
 
 #include <Qt3DRender/private/vsyncframeadvanceservice_p.h>
 
-class FakeRenderThread Q_DECL_FINAL : public QThread
+class FakeRenderThread final : public QThread
 {
 public:
     FakeRenderThread(Qt3DRender::Render::VSyncFrameAdvanceService *tickService)
@@ -55,7 +55,7 @@ public:
 
 protected:
     // QThread interface
-    void run() Q_DECL_FINAL
+    void run() final
     {
         m_tickService->proceedToNextFrame();
 
diff --git a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
index f977a331e..d1ba9d9f9 100644
--- a/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
+++ b/tools/utils/qtcreator/templates/wizards/classes/qt3d/backendnode_p.h
@@ -26,7 +26,7 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 };
 %{JS: Cpp.closeNamespaces('%{Class}')}