Replace old Q_DECL statements with modern C++

Since we have long depended on C++11 now, all of these can go.

Change-Id: I8808af2cd5ce192864c636b521dadd7de189563b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

49 files changed, 315 insertions, 315 deletions

diff --git a/src/animation/backend/handler_p.h b/src/animation/backend/handler_p.h
index 4f9f24091..f565704b8 100644
--- a/src/animation/backend/handler_p.h
+++ b/src/animation/backend/handler_p.h
@@ -110,14 +110,14 @@ public:
     void setBlendedClipAnimatorRunning(const HBlendedClipAnimator &handle, bool running);
     QList<HBlendedClipAnimator> runningBlenndedClipAnimators() const { return m_runningBlendedClipAnimators; }
 
-    AnimationClipLoaderManager *animationClipLoaderManager() const Q_DECL_NOTHROW { return m_animationClipLoaderManager.data(); }
-    ClockManager *clockManager() const Q_DECL_NOTHROW { return m_clockManager.data(); }
-    ClipAnimatorManager *clipAnimatorManager() const Q_DECL_NOTHROW { return m_clipAnimatorManager.data(); }
-    BlendedClipAnimatorManager *blendedClipAnimatorManager() const Q_DECL_NOTHROW { return m_blendedClipAnimatorManager.data(); }
-    ChannelMappingManager *channelMappingManager() const Q_DECL_NOTHROW { return m_channelMappingManager.data(); }
-    ChannelMapperManager *channelMapperManager() const Q_DECL_NOTHROW { return m_channelMapperManager.data(); }
-    ClipBlendNodeManager *clipBlendNodeManager() const Q_DECL_NOTHROW { return m_clipBlendNodeManager.data(); }
-    SkeletonManager *skeletonManager() const Q_DECL_NOTHROW { return m_skeletonManager.data(); }
+    AnimationClipLoaderManager *animationClipLoaderManager() const noexcept { return m_animationClipLoaderManager.data(); }
+    ClockManager *clockManager() const noexcept { return m_clockManager.data(); }
+    ClipAnimatorManager *clipAnimatorManager() const noexcept { return m_clipAnimatorManager.data(); }
+    BlendedClipAnimatorManager *blendedClipAnimatorManager() const noexcept { return m_blendedClipAnimatorManager.data(); }
+    ChannelMappingManager *channelMappingManager() const noexcept { return m_channelMappingManager.data(); }
+    ChannelMapperManager *channelMapperManager() const noexcept { return m_channelMapperManager.data(); }
+    ClipBlendNodeManager *clipBlendNodeManager() const noexcept { return m_clipBlendNodeManager.data(); }
+    SkeletonManager *skeletonManager() const noexcept { return m_skeletonManager.data(); }
 
     std::vector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time);
 
diff --git a/src/animation/frontend/qanimationclipdata.cpp b/src/animation/frontend/qanimationclipdata.cpp
index 8131d194f..41ebe68ef 100644
--- a/src/animation/frontend/qanimationclipdata.cpp
+++ b/src/animation/frontend/qanimationclipdata.cpp
@@ -114,30 +114,30 @@ void QAnimationClipData::clearChannels()
     d->m_channels.clear();
 }
 
-bool QAnimationClipData::isValid() const Q_DECL_NOTHROW
+bool QAnimationClipData::isValid() const noexcept
 {
     // TODO: Perform more thorough checks
     return !d->m_channels.isEmpty();
 }
 
-QAnimationClipData::const_iterator QAnimationClipData::begin() const Q_DECL_NOTHROW
+QAnimationClipData::const_iterator QAnimationClipData::begin() const noexcept
 {
     return d->m_channels.cbegin();
 }
 
-QAnimationClipData::const_iterator QAnimationClipData::end() const Q_DECL_NOTHROW
+QAnimationClipData::const_iterator QAnimationClipData::end() const noexcept
 {
     return d->m_channels.cend();
 }
 
 
-bool operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW
+bool operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name &&
            lhs.d->m_channels == rhs.d->m_channels;
 }
 
-bool operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW
+bool operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name ||
            lhs.d->m_channels != rhs.d->m_channels;
diff --git a/src/animation/frontend/qanimationclipdata.h b/src/animation/frontend/qanimationclipdata.h
index 9a5d92132..07c7d92c2 100644
--- a/src/animation/frontend/qanimationclipdata.h
+++ b/src/animation/frontend/qanimationclipdata.h
@@ -52,8 +52,8 @@ namespace Qt3DAnimation {
 class QAnimationClipDataPrivate;
 class QAnimationClipData;
 
-bool Q_3DANIMATIONSHARED_EXPORT operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW;
-bool Q_3DANIMATIONSHARED_EXPORT operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) Q_DECL_NOTHROW;
+bool Q_3DANIMATIONSHARED_EXPORT operator==(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept;
+bool Q_3DANIMATIONSHARED_EXPORT operator!=(const QAnimationClipData &lhs, const QAnimationClipData &rhs) noexcept;
 
 class Q_3DANIMATIONSHARED_EXPORT QAnimationClipData
 {
@@ -72,25 +72,25 @@ public:
     void removeChannel(int index);
     void clearChannels();
 
-    bool isValid() const Q_DECL_NOTHROW;
+    bool isValid() const noexcept;
 
     // Iterator API
     typedef const QChannel *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QAnimationClipData &,
-                           const QAnimationClipData &) Q_DECL_NOTHROW;
+                           const QAnimationClipData &) noexcept;
     friend bool operator!=(const QAnimationClipData &,
-                           const QAnimationClipData &) Q_DECL_NOTHROW;
+                           const QAnimationClipData &) noexcept;
 
 private:
     QScopedPointer<QAnimationClipDataPrivate> d;
diff --git a/src/animation/frontend/qchannel.cpp b/src/animation/frontend/qchannel.cpp
index 3970ea8ab..8012f1b5c 100644
--- a/src/animation/frontend/qchannel.cpp
+++ b/src/animation/frontend/qchannel.cpp
@@ -136,22 +136,22 @@ void QChannel::clearChannelComponents()
     d->m_channelComponents.clear();
 }
 
-QChannel::const_iterator QChannel::begin() const Q_DECL_NOTHROW
+QChannel::const_iterator QChannel::begin() const noexcept
 {
     return d->m_channelComponents.cbegin();
 }
 
-QChannel::const_iterator QChannel::end() const Q_DECL_NOTHROW
+QChannel::const_iterator QChannel::end() const noexcept
 {
     return d->m_channelComponents.cend();
 }
 
-bool operator==(const QChannel &lhs, const QChannel &rhs) Q_DECL_NOTHROW
+bool operator==(const QChannel &lhs, const QChannel &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name && lhs.d->m_channelComponents == rhs.d->m_channelComponents;
 }
 
-bool operator!=(const QChannel &lhs, const QChannel &rhs) Q_DECL_NOTHROW
+bool operator!=(const QChannel &lhs, const QChannel &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name || lhs.d->m_channelComponents != rhs.d->m_channelComponents;
 }
diff --git a/src/animation/frontend/qchannel.h b/src/animation/frontend/qchannel.h
index 4c856dba5..f13466094 100644
--- a/src/animation/frontend/qchannel.h
+++ b/src/animation/frontend/qchannel.h
@@ -76,19 +76,19 @@ public:
     typedef const QChannelComponent *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QChannel &,
-                           const QChannel &) Q_DECL_NOTHROW;
+                           const QChannel &) noexcept;
     friend bool operator!=(const QChannel &,
-                           const QChannel &) Q_DECL_NOTHROW;
+                           const QChannel &) noexcept;
 
 private:
     QScopedPointer<QChannelPrivate> d;
diff --git a/src/animation/frontend/qchannelcomponent.cpp b/src/animation/frontend/qchannelcomponent.cpp
index e26752aa6..755ed6294 100644
--- a/src/animation/frontend/qchannelcomponent.cpp
+++ b/src/animation/frontend/qchannelcomponent.cpp
@@ -115,23 +115,23 @@ void QChannelComponent::clearKeyFrames()
     d->m_keyFrames.clear();
 }
 
-QChannelComponent::const_iterator QChannelComponent::begin() const Q_DECL_NOTHROW
+QChannelComponent::const_iterator QChannelComponent::begin() const noexcept
 {
     return d->m_keyFrames.cbegin();
 }
 
-QChannelComponent::const_iterator QChannelComponent::end() const Q_DECL_NOTHROW
+QChannelComponent::const_iterator QChannelComponent::end() const noexcept
 {
     return d->m_keyFrames.cend();
 }
 
-bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) Q_DECL_NOTHROW
+bool operator==(const QChannelComponent &lhs, const QChannelComponent &rhs) noexcept
 {
     return lhs.d->m_name == rhs.d->m_name &&
            lhs.d->m_keyFrames == rhs.d->m_keyFrames;
 }
 
-bool operator!=(const QChannelComponent &lhs, const QChannelComponent &rhs) Q_DECL_NOTHROW
+bool operator!=(const QChannelComponent &lhs, const QChannelComponent &rhs) noexcept
 {
     return lhs.d->m_name != rhs.d->m_name ||
            lhs.d->m_keyFrames != rhs.d->m_keyFrames;
diff --git a/src/animation/frontend/qchannelcomponent.h b/src/animation/frontend/qchannelcomponent.h
index aa29d7fd5..066d23447 100644
--- a/src/animation/frontend/qchannelcomponent.h
+++ b/src/animation/frontend/qchannelcomponent.h
@@ -73,19 +73,19 @@ public:
     typedef const QKeyFrame *const_iterator;
     typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
-    const_iterator begin()  const Q_DECL_NOTHROW;
-    const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); }
-    const_iterator end()    const Q_DECL_NOTHROW;
-    const_iterator cend()   const Q_DECL_NOTHROW { return end(); }
-    const_reverse_iterator rbegin()  const Q_DECL_NOTHROW { return const_reverse_iterator(end()); }
-    const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); }
-    const_reverse_iterator rend()    const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crend()   const Q_DECL_NOTHROW { return rend(); }
+    const_iterator begin()  const noexcept;
+    const_iterator cbegin() const noexcept { return begin(); }
+    const_iterator end()    const noexcept;
+    const_iterator cend()   const noexcept { return end(); }
+    const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
+    const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+    const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
+    const_reverse_iterator crend()   const noexcept { return rend(); }
 
     friend bool operator==(const QChannelComponent &,
-                           const QChannelComponent &) Q_DECL_NOTHROW;
+                           const QChannelComponent &) noexcept;
     friend bool operator!=(const QChannelComponent &,
-                           const QChannelComponent &) Q_DECL_NOTHROW;
+                           const QChannelComponent &) noexcept;
 
 private:
     QScopedPointer<QChannelComponentPrivate> d;
diff --git a/src/animation/frontend/qkeyframe.h b/src/animation/frontend/qkeyframe.h
index 87e2812b2..65ff5c4c4 100644
--- a/src/animation/frontend/qkeyframe.h
+++ b/src/animation/frontend/qkeyframe.h
@@ -56,7 +56,7 @@ public:
         BezierInterpolation
     };
 
-    Q_DECL_CONSTEXPR QKeyFrame() Q_DECL_NOTHROW
+    constexpr QKeyFrame() noexcept
         : m_coordinates()
         , m_leftControlPoint()
         , m_rightControlPoint()
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    Q_DECL_CONSTEXPR explicit QKeyFrame(QVector2D coords) Q_DECL_NOTHROW
+    constexpr explicit QKeyFrame(QVector2D coords) noexcept
         : m_coordinates(coords)
         , m_leftControlPoint()
         , m_rightControlPoint()
@@ -72,9 +72,9 @@ public:
     {
     }
 
-    Q_DECL_CONSTEXPR explicit QKeyFrame(QVector2D coords,
+    constexpr explicit QKeyFrame(QVector2D coords,
                                         QVector2D lh,
-                                        QVector2D rh) Q_DECL_NOTHROW
+                                        QVector2D rh) noexcept
         : m_coordinates(coords)
         , m_leftControlPoint(lh)
         , m_rightControlPoint(rh)
@@ -82,48 +82,48 @@ public:
     {
     }
 
-    void setCoordinates(QVector2D coords) Q_DECL_NOTHROW
+    void setCoordinates(QVector2D coords) noexcept
     {
         m_coordinates = coords;
     }
 
-    Q_DECL_CONSTEXPR QVector2D coordinates() const Q_DECL_NOTHROW
+    constexpr QVector2D coordinates() const noexcept
     {
         return m_coordinates;
     }
 
-    void setLeftControlPoint(QVector2D lh) Q_DECL_NOTHROW
+    void setLeftControlPoint(QVector2D lh) noexcept
     {
         m_leftControlPoint = lh;
     }
 
-    Q_DECL_CONSTEXPR QVector2D leftControlPoint() const Q_DECL_NOTHROW
+    constexpr QVector2D leftControlPoint() const noexcept
     {
         return m_leftControlPoint;
     }
 
-    void setRightControlPoint(QVector2D rh) Q_DECL_NOTHROW
+    void setRightControlPoint(QVector2D rh) noexcept
     {
         m_rightControlPoint = rh;
     }
 
-    Q_DECL_CONSTEXPR QVector2D rightControlPoint() const Q_DECL_NOTHROW
+    constexpr QVector2D rightControlPoint() const noexcept
     {
         return m_rightControlPoint;
     }
 
-    void setInterpolationType(InterpolationType interp) Q_DECL_NOTHROW
+    void setInterpolationType(InterpolationType interp) noexcept
     {
         m_interpolationType = interp;
     }
 
-    Q_DECL_CONSTEXPR InterpolationType interpolationType() const Q_DECL_NOTHROW
+    constexpr InterpolationType interpolationType() const noexcept
     {
         return m_interpolationType;
     }
 
-    friend inline bool operator==(const QKeyFrame &, const QKeyFrame &) Q_DECL_NOTHROW;
-    friend inline bool operator!=(const QKeyFrame &, const QKeyFrame &) Q_DECL_NOTHROW;
+    friend inline bool operator==(const QKeyFrame &, const QKeyFrame &) noexcept;
+    friend inline bool operator!=(const QKeyFrame &, const QKeyFrame &) noexcept;
 
 private:
     QVector2D m_coordinates;
@@ -134,7 +134,7 @@ private:
 
 QT3D_DECLARE_TYPEINFO(Qt3DAnimation, QKeyFrame, Q_PRIMITIVE_TYPE)
 
-inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHROW
+inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) noexcept
 {
     if (lhs.m_interpolationType != rhs.m_interpolationType)
         return false;
@@ -148,7 +148,7 @@ inline bool operator==(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHRO
     return lhs.m_coordinates == rhs.m_coordinates;
 }
 
-inline bool operator!=(const QKeyFrame &lhs, const QKeyFrame &rhs) Q_DECL_NOTHROW
+inline bool operator!=(const QKeyFrame &lhs, const QKeyFrame &rhs) noexcept
 {
     return !(lhs == rhs);
 }
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 31938696b..4c42b5093 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -162,7 +162,7 @@ QAbstractAspect::~QAbstractAspect()
 /*!
  * \return root entity node id.
  */
-QNodeId QAbstractAspect::rootEntityId() const Q_DECL_NOEXCEPT
+QNodeId QAbstractAspect::rootEntityId() const noexcept
 {
     Q_D(const QAbstractAspect);
     return d->m_rootId;
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 9a03d04dc..ba2d13139 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -74,7 +74,7 @@ public:
 protected:
     explicit QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = nullptr);
 
-    QNodeId rootEntityId() const Q_DECL_NOEXCEPT;
+    QNodeId rootEntityId() const noexcept;
 
     template<class Frontend>
     void registerBackendType(const QBackendNodeMapperPtr &functor);
diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h
index 41a063900..8a286d356 100644
--- a/src/core/aspects/qaspectfactory_p.h
+++ b/src/core/aspects/qaspectfactory_p.h
@@ -75,7 +75,7 @@ public:
     ~QAspectFactory();
     QAspectFactory &operator=(const QAspectFactory &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QAspectFactory &operator=(QAspectFactory &&other) Q_DECL_NOTHROW
+    QAspectFactory &operator=(QAspectFactory &&other) noexcept
     {
         m_factories.swap(other.m_factories);
         m_aspectNames.swap(other.m_aspectNames);
@@ -83,7 +83,7 @@ public:
     }
 #endif
 
-    inline void swap(QAspectFactory &other) Q_DECL_NOTHROW
+    inline void swap(QAspectFactory &other) noexcept
     {
         m_factories.swap(other.m_factories);
         m_aspectNames.swap(other.m_aspectNames);
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index ce83a8009..c50cfd39c 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -108,7 +108,7 @@ public:
     int id() override { return m_id; }
     void setId(int id) override { m_id = id; }
 
-    RunnableType type() const Q_DECL_OVERRIDE { return RunnableType::AspectTask; }
+    RunnableType type() const override { return RunnableType::AspectTask; }
 
 public:
     QSharedPointer<QAspectJob> m_job;
@@ -140,7 +140,7 @@ public:
     int id() override { return m_id; }
     void setId(int id) override { m_id = id; }
 
-    RunnableType type() const Q_DECL_OVERRIDE { return RunnableType::SyncTask; }
+    RunnableType type() const override { return RunnableType::SyncTask; }
 
 private:
     QAbstractAspectJobManager::JobFunction m_func;
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index 550d43411..ae7a3023b 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -154,7 +154,7 @@ QBackendNode::~QBackendNode()
 /*!
  * Sets the peer \a id.
  */
-void QBackendNode::setPeerId(QNodeId id) Q_DECL_NOTHROW
+void QBackendNode::setPeerId(QNodeId id) noexcept
 {
     Q_D(QBackendNode);
     d->m_peerId = id;
@@ -163,7 +163,7 @@ void QBackendNode::setPeerId(QNodeId id) Q_DECL_NOTHROW
 /*!
  * \return the peer id of the backend node.
  */
-QNodeId QBackendNode::peerId() const Q_DECL_NOTHROW
+QNodeId QBackendNode::peerId() const noexcept
 {
     Q_D(const QBackendNode);
     return d->m_peerId;
@@ -172,7 +172,7 @@ QNodeId QBackendNode::peerId() const Q_DECL_NOTHROW
 /*!
  * \return \c true if the backend node is enabled.
  */
-bool QBackendNode::isEnabled() const Q_DECL_NOTHROW
+bool QBackendNode::isEnabled() const noexcept
 {
     Q_D(const QBackendNode);
     return d->m_enabled;
@@ -181,7 +181,7 @@ bool QBackendNode::isEnabled() const Q_DECL_NOTHROW
 /*!
  * \return the mode of the backend mode.
  */
-QBackendNode::Mode QBackendNode::mode() const Q_DECL_NOTHROW
+QBackendNode::Mode QBackendNode::mode() const noexcept
 {
     Q_D(const QBackendNode);
     return d->m_mode;
@@ -215,7 +215,7 @@ QBackendNode::QBackendNode(QBackendNodePrivate &dd)
 /*!
  * Enables or disables the backend node by \a enabled.
  */
-void QBackendNode::setEnabled(bool enabled) Q_DECL_NOTHROW
+void QBackendNode::setEnabled(bool enabled) noexcept
 {
     Q_D(QBackendNode);
     d->m_enabled = enabled;
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h
index cefa41c52..aefc8f2b9 100644
--- a/src/core/nodes/qbackendnode.h
+++ b/src/core/nodes/qbackendnode.h
@@ -78,12 +78,12 @@ public:
     explicit QBackendNode(Mode mode = ReadOnly);
     virtual ~QBackendNode();
 
-    QNodeId peerId() const Q_DECL_NOEXCEPT;
+    QNodeId peerId() const noexcept;
 
-    void setEnabled(bool enabled) Q_DECL_NOEXCEPT;
-    bool isEnabled() const Q_DECL_NOEXCEPT;
+    void setEnabled(bool enabled) noexcept;
+    bool isEnabled() const noexcept;
 
-    Mode mode() const Q_DECL_NOEXCEPT;
+    Mode mode() const noexcept;
 
     virtual void syncFromFrontEnd(const QNode *frontEnd, bool firstTime);
 
@@ -95,7 +95,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QBackendNode)
-    void setPeerId(QNodeId id) Q_DECL_NOEXCEPT;
+    void setPeerId(QNodeId id) noexcept;
 
     friend class QAbstractAspectPrivate;
 #if defined(QT_BUILD_INTERNAL)
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index 4c7f11d56..ca63d3712 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -98,7 +98,7 @@ private:
 
     // We only want setParent(QNode *) to be callable
     // when dealing with QNode objects
-    void setParent(QObject *) Q_DECL_EQ_DELETE;
+    void setParent(QObject *) = delete;
 
     Q_PRIVATE_SLOT(d_func(), void _q_postConstructorInit())
     Q_PRIVATE_SLOT(d_func(), void _q_addChild(Qt3DCore::QNode *))
@@ -129,12 +129,12 @@ inline QNodeIdVector qIdsForNodes(const T &nodes)
 
 struct QNodeIdTypePair
 {
-    QNodeIdTypePair() Q_DECL_NOTHROW
+    QNodeIdTypePair() noexcept
         : id()
         , type(nullptr)
     {}
 
-    explicit QNodeIdTypePair(QNodeId _id, const QMetaObject *_type) Q_DECL_NOTHROW
+    explicit QNodeIdTypePair(QNodeId _id, const QMetaObject *_type) noexcept
         : id(_id)
         , type(_type)
     {}
diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp
index ece7a531e..2e4d10374 100644
--- a/src/core/nodes/qnodeid.cpp
+++ b/src/core/nodes/qnodeid.cpp
@@ -101,7 +101,7 @@ namespace Qt3DCore {
 /*!
  * \return node id.
  */
-QNodeId QNodeId::createId() Q_DECL_NOTHROW
+QNodeId QNodeId::createId() noexcept
 {
     typedef
 #if defined(Q_ATOMIC_INT64_IS_SUPPORTED)
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h
index 704fc6c76..a51ce684f 100644
--- a/src/core/nodes/qnodeid.h
+++ b/src/core/nodes/qnodeid.h
@@ -50,47 +50,47 @@ namespace Qt3DCore {
 
 class QNodeId
 {
-    Q_DECL_CONSTEXPR explicit QNodeId(quint64 i) Q_DECL_NOTHROW
+    constexpr explicit QNodeId(quint64 i) noexcept
         : m_id(i)
     {}
 public:
-    Q_DECL_CONSTEXPR QNodeId() Q_DECL_NOTHROW
+    constexpr QNodeId() noexcept
         : m_id(0)
     {}
 
-    Q_3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW;
+    Q_3DCORESHARED_EXPORT static QNodeId createId() noexcept;
 
-    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW
+    constexpr bool isNull() const noexcept
     {
         return m_id == 0;
     }
 
-    Q_DECL_CONSTEXPR bool operator ==(QNodeId other) const Q_DECL_NOTHROW
+    constexpr bool operator ==(QNodeId other) const noexcept
     {
         return other.m_id == m_id;
     }
 
-    Q_DECL_CONSTEXPR bool operator !=(QNodeId other) const Q_DECL_NOTHROW
+    constexpr bool operator !=(QNodeId other) const noexcept
     {
         return !operator ==(other);
     }
 
-    Q_DECL_CONSTEXPR bool operator <(QNodeId other) const Q_DECL_NOTHROW
+    constexpr bool operator <(QNodeId other) const noexcept
     {
         return m_id < other.m_id;
     }
 
-    Q_DECL_CONSTEXPR bool operator >(QNodeId other) const Q_DECL_NOTHROW
+    constexpr bool operator >(QNodeId other) const noexcept
     {
         return m_id > other.m_id;
     }
 
-    Q_DECL_CONSTEXPR quint64 id() const Q_DECL_NOTHROW
+    constexpr quint64 id() const noexcept
     {
         return m_id;
     }
 
-    Q_DECL_CONSTEXPR operator bool() const Q_DECL_NOTHROW
+    constexpr operator bool() const noexcept
     {
         return m_id != 0;
     }
@@ -106,7 +106,7 @@ using QNodeIdVector = QList<QNodeId>;
 Q_3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id);
 #endif
 
-inline Q_DECL_CONSTEXPR size_t qHash(QNodeId id, size_t seed = 0) Q_DECL_NOTHROW
+inline constexpr size_t qHash(QNodeId id, size_t seed = 0) noexcept
 {
     using QT_PREPEND_NAMESPACE(qHash);
     return qHash(id.id(), seed);
diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h
index b2ad787c0..acb724eb5 100644
--- a/src/core/qt3dcore_global.h
+++ b/src/core/qt3dcore_global.h
@@ -75,14 +75,14 @@ QT_BEGIN_NAMESPACE
 
 #define QT3D_DECLARE_SHARED(NS, Class) \
     inline void swap(Class &lhs, Class &rhs) \
-        Q_DECL_NOEXCEPT_EXPR(noexcept(lhs.swap(rhs))) \
+        noexcept(noexcept(lhs.swap(rhs))) \
     { lhs.swap(rhs); } \
     QT3D_DECLARE_TYPEINFO(NS, Class, Q_MOVABLE_TYPE) \
     /*end*/
 
 #define QT3D_DECLARE_SHARED_2(OuterNS, InnerNS, Class) \
     inline void swap(Class &lhs, Class &rhs) \
-        Q_DECL_NOEXCEPT_EXPR(noexcept(lhs.swap(rhs))) \
+        noexcept(noexcept(lhs.swap(rhs))) \
     { lhs.swap(rhs); } \
     QT3D_DECLARE_TYPEINFO_2(OuterNS, InnerNS, Class, Q_MOVABLE_TYPE) \
     /*end*/
diff --git a/src/extras/text/qtext2dentity.cpp b/src/extras/text/qtext2dentity.cpp
index 30f928aa9..b373cf2f7 100644
--- a/src/extras/text/qtext2dentity.cpp
+++ b/src/extras/text/qtext2dentity.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace {
 
-inline Q_DECL_CONSTEXPR QRectF scaleRectF(const QRectF &rect, float scale)
+inline constexpr QRectF scaleRectF(const QRectF &rect, float scale)
 {
     return QRectF(rect.left() * scale, rect.top() * scale, rect.width() * scale, rect.height() * scale);
 }
diff --git a/src/extras/text/qtextureatlas_p.h b/src/extras/text/qtextureatlas_p.h
index 8dc9e19b3..c5dbf1fd4 100644
--- a/src/extras/text/qtextureatlas_p.h
+++ b/src/extras/text/qtextureatlas_p.h
@@ -66,7 +66,7 @@ class QTextureAtlas : public Qt3DRender::QAbstractTexture
 
 public:
     typedef int TextureId;
-    static Q_CONSTEXPR TextureId InvalidTexture = -1;
+    static constexpr TextureId InvalidTexture = -1;
 
     QTextureAtlas(Qt3DCore::QNode *parent = nullptr);
     ~QTextureAtlas();
diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h
index 2f5a7de63..861730b5d 100644
--- a/src/input/backend/axisaccumulator_p.h
+++ b/src/input/backend/axisaccumulator_p.h
@@ -73,10 +73,10 @@ public:
     QAxisAccumulator::SourceAxisType sourceAxisType() const { return m_sourceAxisType; }
     float scale() const { return m_scale; }
 
-    float value() const Q_DECL_NOTHROW { return m_value; }
+    float value() const noexcept { return m_value; }
     void setValue(float value);
 
-    float velocity() const Q_DECL_NOTHROW { return  m_velocity; }
+    float velocity() const noexcept { return  m_velocity; }
     void setVelocity(float velocity);
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index f7447eb80..2526fead1 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 namespace {
 
-Q_DECL_CONSTEXPR int signum(float v)
+constexpr int signum(float v)
 {
     return (v > 0.0f) - (v < 0.0f);
 }
diff --git a/src/plugins/renderers/opengl/renderer/renderview_p.h b/src/plugins/renderers/opengl/renderer/renderview_p.h
index 3c1628ba5..7914b1989 100644
--- a/src/plugins/renderers/opengl/renderer/renderview_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderview_p.h
@@ -140,33 +140,33 @@ public:
     void sort();
 
     void setRenderer(Renderer *renderer);
-    inline void setSurfaceSize(const QSize &size) Q_DECL_NOTHROW { m_surfaceSize = size; }
-    inline Renderer *renderer() const Q_DECL_NOTHROW { return m_renderer; }
-    inline NodeManagers *nodeManagers() const Q_DECL_NOTHROW { return m_manager; }
-    inline const QSize &surfaceSize() const Q_DECL_NOTHROW { return m_surfaceSize; }
-    inline void setDevicePixelRatio(qreal r) Q_DECL_NOTHROW { m_devicePixelRatio = r; }
-    inline qreal devicePixelRatio() const Q_DECL_NOTHROW { return m_devicePixelRatio; }
+    inline void setSurfaceSize(const QSize &size) noexcept { m_surfaceSize = size; }
+    inline Renderer *renderer() const noexcept { return m_renderer; }
+    inline NodeManagers *nodeManagers() const noexcept { return m_manager; }
+    inline const QSize &surfaceSize() const noexcept { return m_surfaceSize; }
+    inline void setDevicePixelRatio(qreal r) noexcept { m_devicePixelRatio = r; }
+    inline qreal devicePixelRatio() const noexcept { return m_devicePixelRatio; }
 
-    inline void setRenderCameraLens(CameraLens *renderCameraLens) Q_DECL_NOTHROW { m_renderCameraLens = renderCameraLens; }
-    inline CameraLens *renderCameraLens() const Q_DECL_NOTHROW { return m_renderCameraLens; }
+    inline void setRenderCameraLens(CameraLens *renderCameraLens) noexcept { m_renderCameraLens = renderCameraLens; }
+    inline CameraLens *renderCameraLens() const noexcept { return m_renderCameraLens; }
 
-    inline void setRenderCameraEntity(Entity *renderCameraNode) Q_DECL_NOTHROW { m_renderCameraNode = renderCameraNode; }
-    inline Entity *renderCameraEntity() const Q_DECL_NOTHROW { return m_renderCameraNode; }
+    inline void setRenderCameraEntity(Entity *renderCameraNode) noexcept { m_renderCameraNode = renderCameraNode; }
+    inline Entity *renderCameraEntity() const noexcept { return m_renderCameraNode; }
 
-    inline void setViewMatrix(const Matrix4x4 &viewMatrix) Q_DECL_NOTHROW { m_viewMatrix = viewMatrix; }
-    inline Matrix4x4 viewMatrix() const Q_DECL_NOTHROW { return m_viewMatrix; }
+    inline void setViewMatrix(const Matrix4x4 &viewMatrix) noexcept { m_viewMatrix = viewMatrix; }
+    inline Matrix4x4 viewMatrix() const noexcept { return m_viewMatrix; }
 
-    inline void setViewProjectionMatrix(const Matrix4x4 &viewProjectionMatrix) Q_DECL_NOTHROW { m_viewProjectionMatrix = viewProjectionMatrix; }
-    inline Matrix4x4 viewProjectionMatrix() const Q_DECL_NOTHROW { return m_viewProjectionMatrix; }
+    inline void setViewProjectionMatrix(const Matrix4x4 &viewProjectionMatrix) noexcept { m_viewProjectionMatrix = viewProjectionMatrix; }
+    inline Matrix4x4 viewProjectionMatrix() const noexcept { return m_viewProjectionMatrix; }
 
-    inline void setEyePosition(const Vector3D &eyePos) Q_DECL_NOTHROW { m_eyePos = eyePos; }
-    inline Vector3D eyePosition() const Q_DECL_NOTHROW { return m_eyePos; }
+    inline void setEyePosition(const Vector3D &eyePos) noexcept { m_eyePos = eyePos; }
+    inline Vector3D eyePosition() const noexcept { return m_eyePos; }
 
-    inline void setEyeViewDirection(const Vector3D &dir) Q_DECL_NOTHROW { m_eyeViewDir = dir; }
-    inline Vector3D eyeViewDirection() const Q_DECL_NOTHROW { return m_eyeViewDir; }
+    inline void setEyeViewDirection(const Vector3D &dir) noexcept { m_eyeViewDir = dir; }
+    inline Vector3D eyeViewDirection() const noexcept { return m_eyeViewDir; }
 
-    inline void appendLayerFilter(const Qt3DCore::QNodeId layerFilterId) Q_DECL_NOTHROW { m_layerFilterIds.push_back(layerFilterId); }
-    inline Qt3DCore::QNodeIdVector layerFilters() const Q_DECL_NOTHROW { return m_layerFilterIds; }
+    inline void appendLayerFilter(const Qt3DCore::QNodeId layerFilterId) noexcept { m_layerFilterIds.push_back(layerFilterId); }
+    inline Qt3DCore::QNodeIdVector layerFilters() const noexcept { return m_layerFilterIds; }
 
     inline void appendProximityFilterId(const Qt3DCore::QNodeId proximityFilterId) { m_proximityFilterIds.push_back(proximityFilterId); }
     inline Qt3DCore::QNodeIdVector proximityFilterIds() const { return m_proximityFilterIds; }
@@ -178,41 +178,41 @@ public:
     inline void appendWaitFence(const WaitFence::Data &data) { m_waitFences.push_back(data); }
     inline QList<WaitFence::Data> waitFences() const { return m_waitFences; }
 
-    inline void setRenderPassFilter(const RenderPassFilter *rpFilter) Q_DECL_NOTHROW { m_passFilter = rpFilter; }
-    inline const RenderPassFilter *renderPassFilter() const Q_DECL_NOTHROW { return m_passFilter; }
+    inline void setRenderPassFilter(const RenderPassFilter *rpFilter) noexcept { m_passFilter = rpFilter; }
+    inline const RenderPassFilter *renderPassFilter() const noexcept { return m_passFilter; }
 
-    inline void setTechniqueFilter(const TechniqueFilter *filter) Q_DECL_NOTHROW { m_techniqueFilter = filter; }
-    inline const TechniqueFilter *techniqueFilter() const Q_DECL_NOTHROW { return m_techniqueFilter; }
+    inline void setTechniqueFilter(const TechniqueFilter *filter) noexcept { m_techniqueFilter = filter; }
+    inline const TechniqueFilter *techniqueFilter() const noexcept { return m_techniqueFilter; }
 
-    inline void setRenderCommandDataView(const EntityRenderCommandDataViewPtr &renderCommandDataView) Q_DECL_NOTHROW { m_renderCommandDataView = renderCommandDataView; }
-    inline EntityRenderCommandDataViewPtr renderCommandDataView() const Q_DECL_NOTHROW { return m_renderCommandDataView; }
+    inline void setRenderCommandDataView(const EntityRenderCommandDataViewPtr &renderCommandDataView) noexcept { m_renderCommandDataView = renderCommandDataView; }
+    inline EntityRenderCommandDataViewPtr renderCommandDataView() const noexcept { return m_renderCommandDataView; }
 
     RenderStateSet *getOrCreateStateSet();
-    RenderStateSet *stateSet() const Q_DECL_NOTHROW { return m_stateSet.data(); }
+    RenderStateSet *stateSet() const noexcept { return m_stateSet.data(); }
 
-    inline bool noDraw() const Q_DECL_NOTHROW { return m_noDraw; }
-    void setNoDraw(bool noDraw) Q_DECL_NOTHROW { m_noDraw = noDraw; }
+    inline bool noDraw() const noexcept { return m_noDraw; }
+    void setNoDraw(bool noDraw) noexcept { m_noDraw = noDraw; }
 
-    inline bool isCompute() const Q_DECL_NOTHROW { return m_compute; }
-    void setCompute(bool compute) Q_DECL_NOTHROW { m_compute = compute; }
+    inline bool isCompute() const noexcept { return m_compute; }
+    void setCompute(bool compute) noexcept { m_compute = compute; }
 
-    void setComputeWorkgroups(int x, int y, int z) Q_DECL_NOTHROW { m_workGroups[0] = x; m_workGroups[1] = y; m_workGroups[2] = z; }
-    const int *computeWorkGroups() const Q_DECL_NOTHROW { return m_workGroups; }
-    inline bool frustumCulling() const Q_DECL_NOTHROW { return m_frustumCulling; }
-    void setFrustumCulling(bool frustumCulling) Q_DECL_NOTHROW { m_frustumCulling = frustumCulling; }
-    bool showDebugOverlay() const Q_DECL_NOTHROW { return m_showDebugOverlay; }
-    void setShowDebugOverlay(bool showDebugOverlay) Q_DECL_NOTHROW { m_showDebugOverlay = showDebugOverlay; }
+    void setComputeWorkgroups(int x, int y, int z) noexcept { m_workGroups[0] = x; m_workGroups[1] = y; m_workGroups[2] = z; }
+    const int *computeWorkGroups() const noexcept { return m_workGroups; }
+    inline bool frustumCulling() const noexcept { return m_frustumCulling; }
+    void setFrustumCulling(bool frustumCulling) noexcept { m_frustumCulling = frustumCulling; }
+    bool showDebugOverlay() const noexcept { return m_showDebugOverlay; }
+    void setShowDebugOverlay(bool showDebugOverlay) noexcept { m_showDebugOverlay = showDebugOverlay; }
 
-    inline void setMaterialParameterTable(const MaterialParameterGathererData &parameters) Q_DECL_NOTHROW { m_parameters = parameters; }
+    inline void setMaterialParameterTable(const MaterialParameterGathererData &parameters) noexcept { m_parameters = parameters; }
 
     // TODO: Get rid of this overly complex memory management by splitting out the
     // InnerData as a RenderViewConfig struct. This can be created by setRenderViewConfigFromFrameGraphLeafNode
     // and passed along with the RenderView to the functions that populate the renderview
-    inline void setViewport(const QRectF &vp) Q_DECL_NOTHROW { m_viewport = vp; }
-    inline QRectF viewport() const Q_DECL_NOTHROW { return m_viewport; }
+    inline void setViewport(const QRectF &vp) noexcept { m_viewport = vp; }
+    inline QRectF viewport() const noexcept { return m_viewport; }
 
-    inline float gamma() const Q_DECL_NOTHROW { return m_gamma; }
-    inline void setGamma(float gamma) Q_DECL_NOTHROW { m_gamma = gamma; }
+    inline float gamma() const noexcept { return m_gamma; }
+    inline void setGamma(float gamma) noexcept { m_gamma = gamma; }
 
     // depth and stencil ClearBuffers are cached locally
     // color ClearBuffers are collected, as there may be multiple
@@ -238,26 +238,26 @@ public:
     void setAttachmentPack(const AttachmentPack &pack) { m_attachmentPack = pack; }
     const AttachmentPack &attachmentPack() const { return m_attachmentPack; }
 
-    void setRenderTargetId(Qt3DCore::QNodeId renderTargetId) Q_DECL_NOTHROW { m_renderTarget = renderTargetId; }
-    Qt3DCore::QNodeId renderTargetId() const Q_DECL_NOTHROW { return m_renderTarget; }
+    void setRenderTargetId(Qt3DCore::QNodeId renderTargetId) noexcept { m_renderTarget = renderTargetId; }
+    Qt3DCore::QNodeId renderTargetId() const noexcept { return m_renderTarget; }
 
     void addSortType(const QList<Qt3DRender::QSortPolicy::SortType> &sortTypes) { m_sortingTypes.append(sortTypes); }
 
     void setSurface(QSurface *surface) { m_surface = surface; }
     QSurface *surface() const { return m_surface; }
 
-    void setLightSources(const std::vector<LightSource> &lightSources) Q_DECL_NOTHROW { m_lightSources = lightSources; }
-    void setEnvironmentLight(EnvironmentLight *environmentLight) Q_DECL_NOTHROW { m_environmentLight = environmentLight; }
+    void setLightSources(const std::vector<LightSource> &lightSources) noexcept { m_lightSources = lightSources; }
+    void setEnvironmentLight(EnvironmentLight *environmentLight) noexcept { m_environmentLight = environmentLight; }
 
     void updateMatrices();
 
-    inline void setRenderCaptureNodeId(const Qt3DCore::QNodeId nodeId) Q_DECL_NOTHROW { m_renderCaptureNodeId = nodeId; }
-    inline const Qt3DCore::QNodeId renderCaptureNodeId() const Q_DECL_NOTHROW { return m_renderCaptureNodeId; }
-    inline void setRenderCaptureRequest(const QRenderCaptureRequest& request) Q_DECL_NOTHROW { m_renderCaptureRequest = request; }
-    inline const QRenderCaptureRequest renderCaptureRequest() const Q_DECL_NOTHROW { return m_renderCaptureRequest; }
+    inline void setRenderCaptureNodeId(const Qt3DCore::QNodeId nodeId) noexcept { m_renderCaptureNodeId = nodeId; }
+    inline const Qt3DCore::QNodeId renderCaptureNodeId() const noexcept { return m_renderCaptureNodeId; }
+    inline void setRenderCaptureRequest(const QRenderCaptureRequest& request) noexcept { m_renderCaptureRequest = request; }
+    inline const QRenderCaptureRequest renderCaptureRequest() const noexcept { return m_renderCaptureRequest; }
 
-    void setMemoryBarrier(QMemoryBarrier::Operations barrier) Q_DECL_NOTHROW { m_memoryBarrier = barrier; }
-    QMemoryBarrier::Operations memoryBarrier() const Q_DECL_NOTHROW { return m_memoryBarrier; }
+    void setMemoryBarrier(QMemoryBarrier::Operations barrier) noexcept { m_memoryBarrier = barrier; }
+    QMemoryBarrier::Operations memoryBarrier() const noexcept { return m_memoryBarrier; }
 
     bool isDownloadBuffersEnable() const;
     void setIsDownloadBuffersEnable(bool isDownloadBuffersEnable);
diff --git a/src/plugins/renderers/rhi/renderer/renderview_p.h b/src/plugins/renderers/rhi/renderer/renderview_p.h
index 87ff7407f..df5fe0438 100644
--- a/src/plugins/renderers/rhi/renderer/renderview_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderview_p.h
@@ -165,72 +165,72 @@ public:
     void sort();
 
     void setRenderer(Renderer *renderer);
-    inline void setSurfaceSize(const QSize &size) Q_DECL_NOTHROW { m_surfaceSize = size; }
-    inline Renderer *renderer() const Q_DECL_NOTHROW { return m_renderer; }
-    inline NodeManagers *nodeManagers() const Q_DECL_NOTHROW { return m_manager; }
-    inline const QSize &surfaceSize() const Q_DECL_NOTHROW { return m_surfaceSize; }
-    inline void setDevicePixelRatio(qreal r) Q_DECL_NOTHROW { m_devicePixelRatio = r; }
-    inline qreal devicePixelRatio() const Q_DECL_NOTHROW { return m_devicePixelRatio; }
+    inline void setSurfaceSize(const QSize &size) noexcept { m_surfaceSize = size; }
+    inline Renderer *renderer() const noexcept { return m_renderer; }
+    inline NodeManagers *nodeManagers() const noexcept { return m_manager; }
+    inline const QSize &surfaceSize() const noexcept { return m_surfaceSize; }
+    inline void setDevicePixelRatio(qreal r) noexcept { m_devicePixelRatio = r; }
+    inline qreal devicePixelRatio() const noexcept { return m_devicePixelRatio; }
 
-    inline void setRenderCameraLens(CameraLens *renderCameraLens) Q_DECL_NOTHROW { m_renderCameraLens = renderCameraLens; }
-    inline CameraLens *renderCameraLens() const Q_DECL_NOTHROW { return m_renderCameraLens; }
+    inline void setRenderCameraLens(CameraLens *renderCameraLens) noexcept { m_renderCameraLens = renderCameraLens; }
+    inline CameraLens *renderCameraLens() const noexcept { return m_renderCameraLens; }
 
-    inline void setRenderCameraEntity(Entity *renderCameraNode) Q_DECL_NOTHROW { m_renderCameraNode = renderCameraNode; }
-    inline Entity *renderCameraEntity() const Q_DECL_NOTHROW { return m_renderCameraNode; }
+    inline void setRenderCameraEntity(Entity *renderCameraNode) noexcept { m_renderCameraNode = renderCameraNode; }
+    inline Entity *renderCameraEntity() const noexcept { return m_renderCameraNode; }
 
-    inline void setViewMatrix(const Matrix4x4 &viewMatrix) Q_DECL_NOTHROW { m_viewMatrix = viewMatrix; }
-    inline Matrix4x4 viewMatrix() const Q_DECL_NOTHROW { return m_viewMatrix; }
+    inline void setViewMatrix(const Matrix4x4 &viewMatrix) noexcept { m_viewMatrix = viewMatrix; }
+    inline Matrix4x4 viewMatrix() const noexcept { return m_viewMatrix; }
 
-    inline void setViewProjectionMatrix(const Matrix4x4 &viewProjectionMatrix) Q_DECL_NOTHROW { m_viewProjectionMatrix = viewProjectionMatrix; }
-    inline Matrix4x4 viewProjectionMatrix() const Q_DECL_NOTHROW { return m_viewProjectionMatrix; }
+    inline void setViewProjectionMatrix(const Matrix4x4 &viewProjectionMatrix) noexcept { m_viewProjectionMatrix = viewProjectionMatrix; }
+    inline Matrix4x4 viewProjectionMatrix() const noexcept { return m_viewProjectionMatrix; }
 
-    inline void setEyePosition(const Vector3D &eyePos) Q_DECL_NOTHROW { m_eyePos = eyePos; }
-    inline Vector3D eyePosition() const Q_DECL_NOTHROW { return m_eyePos; }
+    inline void setEyePosition(const Vector3D &eyePos) noexcept { m_eyePos = eyePos; }
+    inline Vector3D eyePosition() const noexcept { return m_eyePos; }
 
-    inline void setEyeViewDirection(const Vector3D &dir) Q_DECL_NOTHROW { m_eyeViewDir = dir; }
-    inline Vector3D eyeViewDirection() const Q_DECL_NOTHROW { return m_eyeViewDir; }
+    inline void setEyeViewDirection(const Vector3D &dir) noexcept { m_eyeViewDir = dir; }
+    inline Vector3D eyeViewDirection() const noexcept { return m_eyeViewDir; }
 
-    inline void appendLayerFilter(const Qt3DCore::QNodeId layerFilterId) Q_DECL_NOTHROW { m_layerFilterIds.push_back(layerFilterId); }
-    inline Qt3DCore::QNodeIdVector layerFilters() const Q_DECL_NOTHROW { return m_layerFilterIds; }
+    inline void appendLayerFilter(const Qt3DCore::QNodeId layerFilterId) noexcept { m_layerFilterIds.push_back(layerFilterId); }
+    inline Qt3DCore::QNodeIdVector layerFilters() const noexcept { return m_layerFilterIds; }
 
     inline void appendProximityFilterId(const Qt3DCore::QNodeId proximityFilterId) { m_proximityFilterIds.push_back(proximityFilterId); }
     inline Qt3DCore::QNodeIdVector proximityFilterIds() const { return m_proximityFilterIds; }
 
-    inline void setRenderPassFilter(const RenderPassFilter *rpFilter) Q_DECL_NOTHROW { m_passFilter = rpFilter; }
-    inline const RenderPassFilter *renderPassFilter() const Q_DECL_NOTHROW { return m_passFilter; }
+    inline void setRenderPassFilter(const RenderPassFilter *rpFilter) noexcept { m_passFilter = rpFilter; }
+    inline const RenderPassFilter *renderPassFilter() const noexcept { return m_passFilter; }
 
-    inline void setTechniqueFilter(const TechniqueFilter *filter) Q_DECL_NOTHROW { m_techniqueFilter = filter; }
-    inline const TechniqueFilter *techniqueFilter() const Q_DECL_NOTHROW { return m_techniqueFilter; }
+    inline void setTechniqueFilter(const TechniqueFilter *filter) noexcept { m_techniqueFilter = filter; }
+    inline const TechniqueFilter *techniqueFilter() const noexcept { return m_techniqueFilter; }
 
-    inline void setRenderCommandDataView(const EntityRenderCommandDataViewPtr &renderCommandDataView) Q_DECL_NOTHROW { m_renderCommandDataView = renderCommandDataView; }
-    inline EntityRenderCommandDataViewPtr renderCommandDataView() const Q_DECL_NOTHROW { return m_renderCommandDataView; }
+    inline void setRenderCommandDataView(const EntityRenderCommandDataViewPtr &renderCommandDataView) noexcept { m_renderCommandDataView = renderCommandDataView; }
+    inline EntityRenderCommandDataViewPtr renderCommandDataView() const noexcept { return m_renderCommandDataView; }
 
     RenderStateSet *getOrCreateStateSet();
-    RenderStateSet *stateSet() const Q_DECL_NOTHROW { return m_stateSet.data(); }
+    RenderStateSet *stateSet() const noexcept { return m_stateSet.data(); }
 
-    inline bool noDraw() const Q_DECL_NOTHROW { return m_noDraw; }
-    void setNoDraw(bool noDraw) Q_DECL_NOTHROW { m_noDraw = noDraw; }
+    inline bool noDraw() const noexcept { return m_noDraw; }
+    void setNoDraw(bool noDraw) noexcept { m_noDraw = noDraw; }
 
-    inline bool isCompute() const Q_DECL_NOTHROW { return m_compute; }
-    void setCompute(bool compute) Q_DECL_NOTHROW { m_compute = compute; }
+    inline bool isCompute() const noexcept { return m_compute; }
+    void setCompute(bool compute) noexcept { m_compute = compute; }
 
-    void setComputeWorkgroups(int x, int y, int z) Q_DECL_NOTHROW { m_workGroups[0] = x; m_workGroups[1] = y; m_workGroups[2] = z; }
-    const int *computeWorkGroups() const Q_DECL_NOTHROW { return m_workGroups; }
-    inline bool frustumCulling() const Q_DECL_NOTHROW { return m_frustumCulling; }
-    void setFrustumCulling(bool frustumCulling) Q_DECL_NOTHROW { m_frustumCulling = frustumCulling; }
-    bool showDebugOverlay() const Q_DECL_NOTHROW { return m_showDebugOverlay; }
-    void setShowDebugOverlay(bool showDebugOverlay) Q_DECL_NOTHROW { m_showDebugOverlay = showDebugOverlay; }
+    void setComputeWorkgroups(int x, int y, int z) noexcept { m_workGroups[0] = x; m_workGroups[1] = y; m_workGroups[2] = z; }
+    const int *computeWorkGroups() const noexcept { return m_workGroups; }
+    inline bool frustumCulling() const noexcept { return m_frustumCulling; }
+    void setFrustumCulling(bool frustumCulling) noexcept { m_frustumCulling = frustumCulling; }
+    bool showDebugOverlay() const noexcept { return m_showDebugOverlay; }
+    void setShowDebugOverlay(bool showDebugOverlay) noexcept { m_showDebugOverlay = showDebugOverlay; }
 
-    inline void setMaterialParameterTable(const MaterialParameterGathererData &parameters) Q_DECL_NOTHROW { m_parameters = parameters; }
+    inline void setMaterialParameterTable(const MaterialParameterGathererData &parameters) noexcept { m_parameters = parameters; }
 
     // TODO: Get rid of this overly complex memory management by splitting out the
     // InnerData as a RenderViewConfig struct. This can be created by setRenderViewConfigFromFrameGraphLeafNode
     // and passed along with the RenderView to the functions that populate the renderview
-    inline void setViewport(const QRectF &vp) Q_DECL_NOTHROW { m_viewport = vp; }
-    inline QRectF viewport() const Q_DECL_NOTHROW { return m_viewport; }
+    inline void setViewport(const QRectF &vp) noexcept { m_viewport = vp; }
+    inline QRectF viewport() const noexcept { return m_viewport; }
 
-    inline float gamma() const Q_DECL_NOTHROW { return m_gamma; }
-    inline void setGamma(float gamma) Q_DECL_NOTHROW { m_gamma = gamma; }
+    inline float gamma() const noexcept { return m_gamma; }
+    inline void setGamma(float gamma) noexcept { m_gamma = gamma; }
 
     // depth and stencil ClearBuffers are cached locally
     // color ClearBuffers are collected, as there may be multiple
@@ -253,23 +253,23 @@ public:
 
     void updateRenderCommand(const EntityRenderCommandDataSubView &subView);
 
-    void setRenderTargetId(Qt3DCore::QNodeId renderTargetId) Q_DECL_NOTHROW { m_renderTarget = renderTargetId; }
-    Qt3DCore::QNodeId renderTargetId() const Q_DECL_NOTHROW { return m_renderTarget; }
+    void setRenderTargetId(Qt3DCore::QNodeId renderTargetId) noexcept { m_renderTarget = renderTargetId; }
+    Qt3DCore::QNodeId renderTargetId() const noexcept { return m_renderTarget; }
 
     void addSortType(const QList<Qt3DRender::QSortPolicy::SortType> &sortTypes) { Qt3DCore::append(m_sortingTypes, sortTypes); }
 
     void setSurface(QSurface *surface) { m_surface = surface; }
     QSurface *surface() const { return m_surface; }
 
-    void setLightSources(const std::vector<LightSource> &lightSources) Q_DECL_NOTHROW { m_lightSources = lightSources; }
-    void setEnvironmentLight(EnvironmentLight *environmentLight) Q_DECL_NOTHROW { m_environmentLight = environmentLight; }
+    void setLightSources(const std::vector<LightSource> &lightSources) noexcept { m_lightSources = lightSources; }
+    void setEnvironmentLight(EnvironmentLight *environmentLight) noexcept { m_environmentLight = environmentLight; }
 
     void updateMatrices();
 
-    inline void setRenderCaptureNodeId(const Qt3DCore::QNodeId nodeId) Q_DECL_NOTHROW { m_renderCaptureNodeId = nodeId; }
-    inline const Qt3DCore::QNodeId renderCaptureNodeId() const Q_DECL_NOTHROW { return m_renderCaptureNodeId; }
-    inline void setRenderCaptureRequest(const QRenderCaptureRequest& request) Q_DECL_NOTHROW { m_renderCaptureRequest = request; }
-    inline const QRenderCaptureRequest renderCaptureRequest() const Q_DECL_NOTHROW { return m_renderCaptureRequest; }
+    inline void setRenderCaptureNodeId(const Qt3DCore::QNodeId nodeId) noexcept { m_renderCaptureNodeId = nodeId; }
+    inline const Qt3DCore::QNodeId renderCaptureNodeId() const noexcept { return m_renderCaptureNodeId; }
+    inline void setRenderCaptureRequest(const QRenderCaptureRequest& request) noexcept { m_renderCaptureRequest = request; }
+    inline const QRenderCaptureRequest renderCaptureRequest() const noexcept { return m_renderCaptureRequest; }
 
 
     bool isDownloadBuffersEnable() const;
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index b6880efbc..90cd378ae 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -132,7 +132,7 @@ const QString COLOR_ATTRIBUTE_NAME = QAttribute::defaultColorAttributeName();
 /*
  * Returns a QMatrix4x4 from \a matrix;
  */
-QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) Q_DECL_NOTHROW
+QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) noexcept
 {
     return QMatrix4x4(matrix.a1, matrix.a2, matrix.a3, matrix.a4,
                       matrix.b1, matrix.b2, matrix.b3, matrix.b4,
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
index bd8b75bbb..bb835ddf5 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
@@ -71,7 +71,7 @@ public:
         setFlag(Blending, m_texture ? m_texture->hasAlphaChannel() : false);
     }
 
-    QSGTexture *texture() const Q_DECL_NOTHROW { return m_texture; }
+    QSGTexture *texture() const noexcept { return m_texture; }
     QSGMaterialType *type() const final { return &Scene3DSGMaterialShader::type; }
     QSGMaterialShader *createShader(QSGRendererInterface::RenderMode renderMode) const final;
 
diff --git a/src/quick3d/imports/scene3d/scene3dsgnode_p.h b/src/quick3d/imports/scene3d/scene3dsgnode_p.h
index a7873bdb8..4c437b4a9 100644
--- a/src/quick3d/imports/scene3d/scene3dsgnode_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgnode_p.h
@@ -67,16 +67,16 @@ public:
     Scene3DSGNode();
     ~Scene3DSGNode();
 
-    void setTexture(QSGTexture *texture) Q_DECL_NOTHROW
+    void setTexture(QSGTexture *texture) noexcept
     {
         m_material.setTexture(texture);
         m_opaqueMaterial.setTexture(texture);
         markDirty(DirtyMaterial);
     }
-    QSGTexture *texture() const Q_DECL_NOTHROW { return m_material.texture(); }
+    QSGTexture *texture() const noexcept { return m_material.texture(); }
 
     void setRect(const QRectF &rect, const QRectF textureRect = QRectF(0.0f, 1.0f, 1.0f, -1.0f));
-    QRectF rect() const Q_DECL_NOTHROW { return m_rect; }
+    QRectF rect() const noexcept { return m_rect; }
 
     void show();
 
diff --git a/src/render/backend/computecommand_p.h b/src/render/backend/computecommand_p.h
index 00e238474..22d643f05 100644
--- a/src/render/backend/computecommand_p.h
+++ b/src/render/backend/computecommand_p.h
@@ -71,11 +71,11 @@ public:
     void cleanup();
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
-    inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
-    inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
-    inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
-    inline int frameCount() const Q_DECL_NOTHROW { return m_frameCount; }
-    inline QComputeCommand::RunType runType() const Q_DECL_NOTHROW { return m_runType; }
+    inline int x() const noexcept { return m_workGroups[0]; }
+    inline int y() const noexcept { return m_workGroups[1]; }
+    inline int z() const noexcept { return m_workGroups[2]; }
+    inline int frameCount() const noexcept { return m_frameCount; }
+    inline QComputeCommand::RunType runType() const noexcept { return m_runType; }
 
     // Called from a job
     void updateFrameCount();
diff --git a/src/render/backend/segmentsvisitor.cpp b/src/render/backend/segmentsvisitor.cpp
index f19801ddf..6749d69f1 100644
--- a/src/render/backend/segmentsvisitor.cpp
+++ b/src/render/backend/segmentsvisitor.cpp
@@ -59,7 +59,7 @@ namespace Render {
 
 namespace {
 
-bool isSegmentBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOTHROW
+bool isSegmentBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept
 {
     switch (type) {
     case Qt3DRender::QGeometryRenderer::Lines:
diff --git a/src/render/backend/trianglesvisitor.cpp b/src/render/backend/trianglesvisitor.cpp
index 336e57c7e..2feb86588 100644
--- a/src/render/backend/trianglesvisitor.cpp
+++ b/src/render/backend/trianglesvisitor.cpp
@@ -62,7 +62,7 @@ namespace Render {
 
 namespace {
 
-bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOTHROW
+bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept
 {
     switch (type) {
     case Qt3DRender::QGeometryRenderer::Triangles:
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 7df8db1da..0fccd96f2 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -68,9 +68,9 @@ public:
 
     void cleanup();
 
-    inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
-    inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
-    inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
+    inline int x() const noexcept { return m_workGroups[0]; }
+    inline int y() const noexcept { return m_workGroups[1]; }
+    inline int z() const noexcept { return m_workGroups[2]; }
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index 3378ececa..b3ab9032d 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -71,9 +71,9 @@ public:
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
     QSurface *surface() const { return m_surface; }
-    inline int width() const Q_DECL_NOTHROW { return m_width; }
-    inline int height() const Q_DECL_NOTHROW { return m_height; }
-    inline float devicePixelRatio() const Q_DECL_NOTHROW { return m_devicePixelRatio; }
+    inline int width() const noexcept { return m_width; }
+    inline int height() const noexcept { return m_height; }
+    inline float devicePixelRatio() const noexcept { return m_devicePixelRatio; }
 
 private:
     QObject *m_surfaceObj;
diff --git a/src/render/jobs/filterentitybycomponentjob_p.h b/src/render/jobs/filterentitybycomponentjob_p.h
index 55f502300..8ee082af2 100644
--- a/src/render/jobs/filterentitybycomponentjob_p.h
+++ b/src/render/jobs/filterentitybycomponentjob_p.h
@@ -77,8 +77,8 @@ public:
         SET_JOB_RUN_STAT_TYPE(this, JobTypes::EntityComponentTypeFiltering, 0)
     }
 
-    inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
-    inline std::vector<Entity *> &filteredEntities() Q_DECL_NOTHROW { return m_filteredEntities; }
+    inline void setManager(EntityManager *manager) noexcept { m_manager = manager; }
+    inline std::vector<Entity *> &filteredEntities() noexcept { return m_filteredEntities; }
 
     void run() override
     {
diff --git a/src/render/jobs/filterlayerentityjob_p.h b/src/render/jobs/filterlayerentityjob_p.h
index 3d32047a4..cdd309443 100644
--- a/src/render/jobs/filterlayerentityjob_p.h
+++ b/src/render/jobs/filterlayerentityjob_p.h
@@ -70,11 +70,11 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT FilterLayerEntityJob : public Qt3DCore::QA
 public:
     FilterLayerEntityJob();
 
-    inline void setManager(NodeManagers *manager) Q_DECL_NOEXCEPT { m_manager = manager; }
-    inline void setLayerFilters(const Qt3DCore::QNodeIdVector &layerIds) Q_DECL_NOEXCEPT { m_layerFilterIds = layerIds; }
-    inline std::vector<Entity *> &filteredEntities() Q_DECL_NOEXCEPT { return m_filteredEntities; }
+    inline void setManager(NodeManagers *manager) noexcept { m_manager = manager; }
+    inline void setLayerFilters(const Qt3DCore::QNodeIdVector &layerIds) noexcept { m_layerFilterIds = layerIds; }
+    inline std::vector<Entity *> &filteredEntities() noexcept { return m_filteredEntities; }
 
-    inline bool hasLayerFilter() const Q_DECL_NOTHROW { return !m_layerFilterIds.isEmpty(); }
+    inline bool hasLayerFilter() const noexcept { return !m_layerFilterIds.isEmpty(); }
     inline Qt3DCore::QNodeIdVector layerFilters() const { return m_layerFilterIds; }
 
     // QAspectJob interface
diff --git a/src/render/jobs/frustumcullingjob_p.h b/src/render/jobs/frustumcullingjob_p.h
index ec31afb8c..85356247e 100644
--- a/src/render/jobs/frustumcullingjob_p.h
+++ b/src/render/jobs/frustumcullingjob_p.h
@@ -77,15 +77,15 @@ public:
 
     QT3D_ALIGNED_MALLOC_AND_FREE()
 
-    inline void setRoot(Entity *root) Q_DECL_NOTHROW { m_root = root; }
-    inline void setManagers(NodeManagers *manager) Q_DECL_NOTHROW { m_manager = manager; }
-    inline void setActive(bool active) Q_DECL_NOTHROW { m_active = active; }
-    inline bool isActive() const Q_DECL_NOTHROW { return m_active; }
-    inline void setViewProjection(const Matrix4x4 &viewProjection) Q_DECL_NOTHROW { m_viewProjection = viewProjection; }
-    inline Matrix4x4 viewProjection() const Q_DECL_NOTHROW { return m_viewProjection; }
+    inline void setRoot(Entity *root) noexcept { m_root = root; }
+    inline void setManagers(NodeManagers *manager) noexcept { m_manager = manager; }
+    inline void setActive(bool active) noexcept { m_active = active; }
+    inline bool isActive() const noexcept { return m_active; }
+    inline void setViewProjection(const Matrix4x4 &viewProjection) noexcept { m_viewProjection = viewProjection; }
+    inline Matrix4x4 viewProjection() const noexcept { return m_viewProjection; }
     bool isRequired() override;
 
-    const std::vector<Entity *> &visibleEntities() const Q_DECL_NOTHROW { return m_visibleEntities; }
+    const std::vector<Entity *> &visibleEntities() const noexcept { return m_visibleEntities; }
 
     void run() final;
 
diff --git a/src/render/jobs/lightgatherer_p.h b/src/render/jobs/lightgatherer_p.h
index 806426c60..af0d57ab4 100644
--- a/src/render/jobs/lightgatherer_p.h
+++ b/src/render/jobs/lightgatherer_p.h
@@ -69,7 +69,7 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT LightGatherer : public Qt3DCore::QAspectJo
 public:
     LightGatherer();
 
-    inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
+    inline void setManager(EntityManager *manager) noexcept { m_manager = manager; }
     inline std::vector<LightSource> &lights() { return m_lights; }
     inline EnvironmentLight *environmentLight() const { return m_environmentLight; }
 
diff --git a/src/render/jobs/materialparametergathererjob_p.h b/src/render/jobs/materialparametergathererjob_p.h
index 382e707b7..1818a5980 100644
--- a/src/render/jobs/materialparametergathererjob_p.h
+++ b/src/render/jobs/materialparametergathererjob_p.h
@@ -75,15 +75,15 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT MaterialParameterGathererJob : public Qt3D
 public:
     MaterialParameterGathererJob();
 
-    inline void setNodeManagers(NodeManagers *manager) Q_DECL_NOTHROW { m_manager = manager; }
-    inline void setTechniqueFilter(TechniqueFilter *techniqueFilter) Q_DECL_NOTHROW { m_techniqueFilter = techniqueFilter; }
-    inline void setRenderPassFilter(RenderPassFilter *renderPassFilter) Q_DECL_NOTHROW { m_renderPassFilter = renderPassFilter; }
-    inline const MaterialParameterGathererData &materialToPassAndParameter() Q_DECL_NOTHROW { return m_parameters; }
-    inline void setHandles(std::vector<HMaterial> &&handles) Q_DECL_NOTHROW { m_handles = std::move(handles); }
-    inline void setHandles(const std::vector<HMaterial> &handles) Q_DECL_NOTHROW { m_handles = handles; }
-
-    inline TechniqueFilter *techniqueFilter() const Q_DECL_NOTHROW { return m_techniqueFilter; }
-    inline RenderPassFilter *renderPassFilter() const Q_DECL_NOTHROW { return m_renderPassFilter; }
+    inline void setNodeManagers(NodeManagers *manager) noexcept { m_manager = manager; }
+    inline void setTechniqueFilter(TechniqueFilter *techniqueFilter) noexcept { m_techniqueFilter = techniqueFilter; }
+    inline void setRenderPassFilter(RenderPassFilter *renderPassFilter) noexcept { m_renderPassFilter = renderPassFilter; }
+    inline const MaterialParameterGathererData &materialToPassAndParameter() noexcept { return m_parameters; }
+    inline void setHandles(std::vector<HMaterial> &&handles) noexcept { m_handles = std::move(handles); }
+    inline void setHandles(const std::vector<HMaterial> &handles) noexcept { m_handles = handles; }
+
+    inline TechniqueFilter *techniqueFilter() const noexcept { return m_techniqueFilter; }
+    inline RenderPassFilter *renderPassFilter() const noexcept { return m_renderPassFilter; }
 
     void run() final;
 
diff --git a/src/render/jobs/renderviewcommandbuilderjob_p.h b/src/render/jobs/renderviewcommandbuilderjob_p.h
index 4d235c98e..621fd8654 100644
--- a/src/render/jobs/renderviewcommandbuilderjob_p.h
+++ b/src/render/jobs/renderviewcommandbuilderjob_p.h
@@ -71,7 +71,7 @@ public:
         SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewCommandBuilder, RenderViewCommandBuilderJob::renderViewInstanceCounter++)
     }
 
-    inline void setRenderView(RenderView *rv) Q_DECL_NOTHROW { m_renderView = rv; }
+    inline void setRenderView(RenderView *rv) noexcept { m_renderView = rv; }
     inline void setEntities(const Entity **entities, int offset, int count)
     {
         m_offset = offset;
diff --git a/src/render/jobs/renderviewcommandupdaterjob_p.h b/src/render/jobs/renderviewcommandupdaterjob_p.h
index b97ad4d5a..7c588c3dd 100644
--- a/src/render/jobs/renderviewcommandupdaterjob_p.h
+++ b/src/render/jobs/renderviewcommandupdaterjob_p.h
@@ -76,8 +76,8 @@ public:
     {
     }
 
-    inline void setRenderView(RenderView *rv) Q_DECL_NOTHROW { m_renderView = rv; }
-    inline void setRenderablesSubView(const EntityRenderCommandDataSubView<RenderCommand> &renderablesSubView) Q_DECL_NOTHROW
+    inline void setRenderView(RenderView *rv) noexcept { m_renderView = rv; }
+    inline void setRenderablesSubView(const EntityRenderCommandDataSubView<RenderCommand> &renderablesSubView) noexcept
     {
         m_renderablesSubView = renderablesSubView;
     }
diff --git a/src/render/jobs/renderviewinitializerjob_p.h b/src/render/jobs/renderviewinitializerjob_p.h
index 4c307dc3e..226102ff5 100644
--- a/src/render/jobs/renderviewinitializerjob_p.h
+++ b/src/render/jobs/renderviewinitializerjob_p.h
@@ -81,7 +81,7 @@ public:
     }
 
     inline void setRenderer(Renderer *renderer) { m_renderer = renderer; }
-    inline RenderView *renderView() const Q_DECL_NOTHROW { return m_renderView; }
+    inline RenderView *renderView() const noexcept { return m_renderView; }
 
     inline void setFrameGraphLeafNode(FrameGraphNode *fgLeaf)
     {
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 11c7cbd98..3677bf4cf 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -215,12 +215,12 @@ ParameterInfo::ParameterInfo(const int nameId, const HParameter &handle)
     , handle(handle)
 {}
 
-bool ParameterInfo::operator<(const ParameterInfo &other) const Q_DECL_NOEXCEPT
+bool ParameterInfo::operator<(const ParameterInfo &other) const noexcept
 {
     return nameId < other.nameId;
 }
 
-bool ParameterInfo::operator<(const int otherNameId) const Q_DECL_NOEXCEPT
+bool ParameterInfo::operator<(const int otherNameId) const noexcept
 {
     return nameId < otherNameId;
 }
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index db46a114a..be1aee0e9 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
@@ -105,8 +105,8 @@ struct ParameterInfo
     int nameId;
     HParameter handle;
 
-    bool operator<(const int otherNameId) const Q_DECL_NOEXCEPT;
-    bool operator<(const ParameterInfo &other) const Q_DECL_NOEXCEPT;
+    bool operator<(const int otherNameId) const noexcept;
+    bool operator<(const ParameterInfo &other) const noexcept;
 };
 using ParameterInfoList = QList<ParameterInfo>;
 
diff --git a/src/render/jobs/updateworldboundingvolumejob_p.h b/src/render/jobs/updateworldboundingvolumejob_p.h
index afb8cc6e1..71c15dcd1 100644
--- a/src/render/jobs/updateworldboundingvolumejob_p.h
+++ b/src/render/jobs/updateworldboundingvolumejob_p.h
@@ -67,7 +67,7 @@ class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldBoundingVolumeJob : public Qt3D
 public:
     UpdateWorldBoundingVolumeJob();
 
-    inline void setManager(EntityManager *manager) Q_DECL_NOTHROW { m_manager = manager; }
+    inline void setManager(EntityManager *manager) noexcept { m_manager = manager; }
     void run() override;
 
 private:
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 8a30d6657..fed874473 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -74,7 +74,7 @@ public:
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
     QString name() const;
-    int nameId() const Q_DECL_NOTHROW { return m_nameId; }
+    int nameId() const noexcept { return m_nameId; }
     const UniformValue &uniformValue() const { return m_uniformValue; }
     QVariant backendValue() const { return m_backendValue; }
 
diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h
index 1e608ecd2..95c7de160 100644
--- a/src/render/raycasting/qcollisionqueryresult_p.h
+++ b/src/render/raycasting/qcollisionqueryresult_p.h
@@ -108,14 +108,14 @@ public:
 
     QCollisionQueryResult &operator=(const QCollisionQueryResult &);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QCollisionQueryResult &operator=(QCollisionQueryResult &&other) Q_DECL_NOTHROW
+    QCollisionQueryResult &operator=(QCollisionQueryResult &&other) noexcept
     {
         swap(other);
         return *this;
     }
 #endif
 
-    void swap(QCollisionQueryResult &other) Q_DECL_NOTHROW
+    void swap(QCollisionQueryResult &other) noexcept
     {
         qSwap(d_ptr, other.d_ptr);
     }
diff --git a/src/render/shadergraph/qshaderformat.cpp b/src/render/shadergraph/qshaderformat.cpp
index 81077b6f5..47a511f57 100644
--- a/src/render/shadergraph/qshaderformat.cpp
+++ b/src/render/shadergraph/qshaderformat.cpp
@@ -127,12 +127,12 @@ bool QShaderFormat::supports(const QShaderFormat &other) const noexcept
     return true;
 }
 
-QShaderFormat::ShaderType QShaderFormat::shaderType() const Q_DECL_NOTHROW
+QShaderFormat::ShaderType QShaderFormat::shaderType() const noexcept
 {
     return m_shaderType;
 }
 
-void QShaderFormat::setShaderType(QShaderFormat::ShaderType shaderType) Q_DECL_NOTHROW
+void QShaderFormat::setShaderType(QShaderFormat::ShaderType shaderType) noexcept
 {
     m_shaderType = shaderType;
 }
diff --git a/src/render/shadergraph/qshaderformat_p.h b/src/render/shadergraph/qshaderformat_p.h
index ad9898bd0..2db150de2 100644
--- a/src/render/shadergraph/qshaderformat_p.h
+++ b/src/render/shadergraph/qshaderformat_p.h
@@ -98,8 +98,8 @@ public:
     Q_3DRENDERSHARED_PRIVATE_EXPORT bool isValid() const noexcept;
     Q_3DRENDERSHARED_PRIVATE_EXPORT bool supports(const QShaderFormat &other) const noexcept;
 
-    Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderType shaderType() const Q_DECL_NOTHROW;
-    Q_3DRENDERSHARED_PRIVATE_EXPORT void setShaderType(ShaderType shaderType) Q_DECL_NOTHROW;
+    Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderType shaderType() const noexcept;
+    Q_3DRENDERSHARED_PRIVATE_EXPORT void setShaderType(ShaderType shaderType) noexcept;
 
 private:
     Api m_api;
diff --git a/src/render/texture/qtextureimagedata.cpp b/src/render/texture/qtextureimagedata.cpp
index da4bc6800..37401ea4a 100644
--- a/src/render/texture/qtextureimagedata.cpp
+++ b/src/render/texture/qtextureimagedata.cpp
@@ -191,7 +191,7 @@ QTextureImageData &QTextureImageData::operator=(const QTextureImageData &other)
 /*!
   Remove stored texture data and return the object to its initial state
  */
-void QTextureImageData::cleanup() Q_DECL_NOTHROW
+void QTextureImageData::cleanup() noexcept
 {
     Q_D(QTextureImageData);
     d->m_width = -1;
@@ -209,7 +209,7 @@ void QTextureImageData::cleanup() Q_DECL_NOTHROW
 /*!
   \return true if the stored texture is in a compressed format
  */
-bool QTextureImageData::isCompressed() const Q_DECL_NOTHROW
+bool QTextureImageData::isCompressed() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_isCompressed;
@@ -218,7 +218,7 @@ bool QTextureImageData::isCompressed() const Q_DECL_NOTHROW
 /*!
   \return the width of the stored texture
 */
-int QTextureImageData::width() const Q_DECL_NOTHROW
+int QTextureImageData::width() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_width;
@@ -227,7 +227,7 @@ int QTextureImageData::width() const Q_DECL_NOTHROW
 /*!
   \return the height of the stored texture
  */
-int QTextureImageData::height() const Q_DECL_NOTHROW
+int QTextureImageData::height() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_height;
@@ -236,7 +236,7 @@ int QTextureImageData::height() const Q_DECL_NOTHROW
 /*!
   \return the depth of the stored texture
  */
-int QTextureImageData::depth() const Q_DECL_NOTHROW
+int QTextureImageData::depth() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_depth;
@@ -245,7 +245,7 @@ int QTextureImageData::depth() const Q_DECL_NOTHROW
 /*!
   \return the number of layers in the stored texture
  */
-int QTextureImageData::layers() const Q_DECL_NOTHROW
+int QTextureImageData::layers() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_layers;
@@ -254,7 +254,7 @@ int QTextureImageData::layers() const Q_DECL_NOTHROW
 /*!
   \return the number of mip levels in the stored texture
  */
-int QTextureImageData::mipLevels() const Q_DECL_NOTHROW
+int QTextureImageData::mipLevels() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_mipLevels;
@@ -263,7 +263,7 @@ int QTextureImageData::mipLevels() const Q_DECL_NOTHROW
 /*!
   \return the number of faces in the stored texture
  */
-int QTextureImageData::faces() const Q_DECL_NOTHROW
+int QTextureImageData::faces() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_faces;;
@@ -273,7 +273,7 @@ int QTextureImageData::faces() const Q_DECL_NOTHROW
  * Sets the width to \a width.
  * \param setWidth
  */
-void QTextureImageData::setWidth(int width) Q_DECL_NOTHROW
+void QTextureImageData::setWidth(int width) noexcept
 {
     Q_D(QTextureImageData);
     d->m_width = width;
@@ -283,7 +283,7 @@ void QTextureImageData::setWidth(int width) Q_DECL_NOTHROW
  * Sets the height to \a height.
  * \param setHeight
  */
-void QTextureImageData::setHeight(int height) Q_DECL_NOTHROW
+void QTextureImageData::setHeight(int height) noexcept
 {
     Q_D(QTextureImageData);
     d->m_height = height;
@@ -293,7 +293,7 @@ void QTextureImageData::setHeight(int height) Q_DECL_NOTHROW
  * Sets the depth to \a depth.
  * \param setDepth
  */
-void QTextureImageData::setDepth(int depth) Q_DECL_NOTHROW
+void QTextureImageData::setDepth(int depth) noexcept
 {
     Q_D(QTextureImageData);
     d->m_depth = depth;
@@ -303,7 +303,7 @@ void QTextureImageData::setDepth(int depth) Q_DECL_NOTHROW
  * Sets the layers to \a layers.
  * \param setLayers
  */
-void QTextureImageData::setLayers(int layers) Q_DECL_NOTHROW
+void QTextureImageData::setLayers(int layers) noexcept
 {
     Q_D(QTextureImageData);
     d->m_layers = layers;
@@ -313,7 +313,7 @@ void QTextureImageData::setLayers(int layers) Q_DECL_NOTHROW
  * Sets the mip levels to \a mipLevels.
  * \param setMipLevels
  */
-void QTextureImageData::setMipLevels(int mipLevels) Q_DECL_NOTHROW
+void QTextureImageData::setMipLevels(int mipLevels) noexcept
 {
     Q_D(QTextureImageData);
     d->m_mipLevels = mipLevels;
@@ -323,7 +323,7 @@ void QTextureImageData::setMipLevels(int mipLevels) Q_DECL_NOTHROW
  * Sets the faces to \a faces.
  * \param setFaces
  */
-void QTextureImageData::setFaces(int faces) Q_DECL_NOTHROW
+void QTextureImageData::setFaces(int faces) noexcept
 {
     Q_D(QTextureImageData);
     d->m_faces = faces;
@@ -333,7 +333,7 @@ void QTextureImageData::setFaces(int faces) Q_DECL_NOTHROW
  * Sets the alignment requirements for the image
  * \param alignment
  */
-void QTextureImageData::setAlignment(int alignment) Q_DECL_NOTHROW
+void QTextureImageData::setAlignment(int alignment) noexcept
 {
     Q_D(QTextureImageData);
     d->m_alignment = alignment;
@@ -342,7 +342,7 @@ void QTextureImageData::setAlignment(int alignment) Q_DECL_NOTHROW
 /*!
   \return the alignment requirement for the image
  */
-int QTextureImageData::alignment() const Q_DECL_NOTHROW
+int QTextureImageData::alignment() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_alignment;
@@ -351,7 +351,7 @@ int QTextureImageData::alignment() const Q_DECL_NOTHROW
 /*!
   \return the target for the stored texture
  */
-QOpenGLTexture::Target QTextureImageData::target() const Q_DECL_NOTHROW
+QOpenGLTexture::Target QTextureImageData::target() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_target;
@@ -360,7 +360,7 @@ QOpenGLTexture::Target QTextureImageData::target() const Q_DECL_NOTHROW
 /*!
   \return the format of the stored texture
  */
-QOpenGLTexture::TextureFormat QTextureImageData::format() const Q_DECL_NOTHROW
+QOpenGLTexture::TextureFormat QTextureImageData::format() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_format;
@@ -370,7 +370,7 @@ QOpenGLTexture::TextureFormat QTextureImageData::format() const Q_DECL_NOTHROW
  * Sets the target to \a target.
  * \param target
  */
-void QTextureImageData::setTarget(QOpenGLTexture::Target target) Q_DECL_NOTHROW
+void QTextureImageData::setTarget(QOpenGLTexture::Target target) noexcept
 {
     Q_D(QTextureImageData);
     d->m_target = target;
@@ -380,7 +380,7 @@ void QTextureImageData::setTarget(QOpenGLTexture::Target target) Q_DECL_NOTHROW
  * Sets the format to \a format.
  * \param
  */
-void QTextureImageData::setFormat(QOpenGLTexture::TextureFormat format) Q_DECL_NOTHROW
+void QTextureImageData::setFormat(QOpenGLTexture::TextureFormat format) noexcept
 {
     Q_D(QTextureImageData);
     d->m_format = format;
@@ -390,7 +390,7 @@ void QTextureImageData::setFormat(QOpenGLTexture::TextureFormat format) Q_DECL_N
  * Sets the pixel format to \a pixelFormat.
  * \param setPixelFormat
  */
-void QTextureImageData::setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat) Q_DECL_NOTHROW
+void QTextureImageData::setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat) noexcept
 {
     Q_D(QTextureImageData);
     d->m_pixelFormat = pixelFormat;
@@ -400,7 +400,7 @@ void QTextureImageData::setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat)
  * Sets the pixel type to \a pixelType
  * \param setPixelType
  */
-void QTextureImageData::setPixelType(QOpenGLTexture::PixelType pixelType) Q_DECL_NOTHROW
+void QTextureImageData::setPixelType(QOpenGLTexture::PixelType pixelType) noexcept
 {
     Q_D(QTextureImageData);
     d->m_pixelType = pixelType;
@@ -457,7 +457,7 @@ QByteArray QTextureImageData::data(int layer, int face, int mipmapLevel) const
 /*!
   \return the pixel format of the stored texture
  */
-QOpenGLTexture::PixelFormat QTextureImageData::pixelFormat() const Q_DECL_NOTHROW
+QOpenGLTexture::PixelFormat QTextureImageData::pixelFormat() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_pixelFormat;
@@ -466,7 +466,7 @@ QOpenGLTexture::PixelFormat QTextureImageData::pixelFormat() const Q_DECL_NOTHRO
 /*!
   \return the pixel type of the stored texture
  */
-QOpenGLTexture::PixelType QTextureImageData::pixelType() const Q_DECL_NOTHROW
+QOpenGLTexture::PixelType QTextureImageData::pixelType() const noexcept
 {
     Q_D(const QTextureImageData);
     return d->m_pixelType;
diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h
index 01844b943..684a03f5a 100644
--- a/src/render/texture/qtextureimagedata.h
+++ b/src/render/texture/qtextureimagedata.h
@@ -59,40 +59,40 @@ public:
 
     QTextureImageData &operator=(const QTextureImageData &other);
 
-    void cleanup() Q_DECL_NOTHROW;
+    void cleanup() noexcept;
 
-    bool isCompressed() const Q_DECL_NOTHROW;
+    bool isCompressed() const noexcept;
 
-    int width() const Q_DECL_NOTHROW;
-    int height() const Q_DECL_NOTHROW;
-    int depth() const Q_DECL_NOTHROW;
+    int width() const noexcept;
+    int height() const noexcept;
+    int depth() const noexcept;
 
-    int layers() const Q_DECL_NOTHROW;
-    int mipLevels() const Q_DECL_NOTHROW;
-    int faces() const Q_DECL_NOTHROW;
+    int layers() const noexcept;
+    int mipLevels() const noexcept;
+    int faces() const noexcept;
 
-    void setWidth(int width) Q_DECL_NOTHROW;
-    void setHeight(int height) Q_DECL_NOTHROW;
-    void setDepth(int depth) Q_DECL_NOTHROW;
+    void setWidth(int width) noexcept;
+    void setHeight(int height) noexcept;
+    void setDepth(int depth) noexcept;
 
-    void setLayers(int layers) Q_DECL_NOTHROW;
-    void setMipLevels(int mipLevels) Q_DECL_NOTHROW;
-    void setFaces(int faces) Q_DECL_NOTHROW;
+    void setLayers(int layers) noexcept;
+    void setMipLevels(int mipLevels) noexcept;
+    void setFaces(int faces) noexcept;
 
-    int alignment() const Q_DECL_NOTHROW;
-    void setAlignment(int alignment) Q_DECL_NOTHROW;
+    int alignment() const noexcept;
+    void setAlignment(int alignment) noexcept;
 
-    QOpenGLTexture::Target target() const Q_DECL_NOTHROW;
-    QOpenGLTexture::TextureFormat format() const Q_DECL_NOTHROW;
+    QOpenGLTexture::Target target() const noexcept;
+    QOpenGLTexture::TextureFormat format() const noexcept;
 
-    QOpenGLTexture::PixelFormat pixelFormat() const Q_DECL_NOTHROW;
-    QOpenGLTexture::PixelType pixelType() const Q_DECL_NOTHROW;
+    QOpenGLTexture::PixelFormat pixelFormat() const noexcept;
+    QOpenGLTexture::PixelType pixelType() const noexcept;
 
-    void setTarget(QOpenGLTexture::Target target) Q_DECL_NOTHROW;
-    void setFormat(QOpenGLTexture::TextureFormat format) Q_DECL_NOTHROW;
+    void setTarget(QOpenGLTexture::Target target) noexcept;
+    void setFormat(QOpenGLTexture::TextureFormat format) noexcept;
 
-    void setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat) Q_DECL_NOTHROW;
-    void setPixelType(QOpenGLTexture::PixelType pixelType) Q_DECL_NOTHROW;
+    void setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat) noexcept;
+    void setPixelType(QOpenGLTexture::PixelType pixelType) noexcept;
 
     void setImage(const QImage &);
     void setData(const QByteArray &data,