Replace Q_DECL_FINAL with final

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

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;

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();

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;

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;
 };

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;

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;

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);
     }

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;
 

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;
 };

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;

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);
     }

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);

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();

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

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;
 };
 

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)
 };

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)

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)

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;

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;

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;
 };

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;

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;

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;

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;

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);
     }

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;

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;

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;
 };

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;

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;
 };

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;

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;

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;
 

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;

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;

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;

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);

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);

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;
 

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;
 };

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

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);

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);

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();

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);

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);
     }

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:

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

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;

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;

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;

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);
 

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; }

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);

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;

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;

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);
     }

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;

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;
 };

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;
 };

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;

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;

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;

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;

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;
 };

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;

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];
 };

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;

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;
 };
 

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;

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:
 

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;

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;

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;

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;
 };

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;
 };
 

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);

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;

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);
 

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;

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;

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;

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;

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;

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;

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;

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();

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);

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)

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;

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);

src/render/jobs/genericlambdajob_p.h

@@ -72,7 +72,7 @@ public:
     }
 
     // QAspectJob interface
-    void run() Q_DECL_FINAL
+    void run() final
     {
         m_callable();
     }

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;

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;

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;

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,

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;

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;

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;