Replace Q_DECL_NOEXCEPT by Q_DECL_NOTHROW

Change-Id: Ia991da557483704055e0ccf17b4a6b273568a1ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

30 files changed, 120 insertions, 120 deletions

diff --git a/src/core/changes/qcomponentaddedchange.cpp b/src/core/changes/qcomponentaddedchange.cpp
index d88f4e060..96e8e8562 100644
--- a/src/core/changes/qcomponentaddedchange.cpp
+++ b/src/core/changes/qcomponentaddedchange.cpp
@@ -66,19 +66,19 @@ QComponentAddedChange::~QComponentAddedChange()
 {
 }
 
-QNodeId QComponentAddedChange::entityId() const Q_DECL_NOEXCEPT
+QNodeId QComponentAddedChange::entityId() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentAddedChange);
     return d->m_entityId;
 }
 
-QNodeId QComponentAddedChange::componentId() const Q_DECL_NOEXCEPT
+QNodeId QComponentAddedChange::componentId() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentAddedChange);
     return d->m_componentId;
 }
 
-const QMetaObject *QComponentAddedChange::componentMetaObject() const Q_DECL_NOEXCEPT
+const QMetaObject *QComponentAddedChange::componentMetaObject() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentAddedChange);
     return d->m_componentMetaObject;
diff --git a/src/core/changes/qcomponentaddedchange.h b/src/core/changes/qcomponentaddedchange.h
index 73d3572b3..a62cac116 100644
--- a/src/core/changes/qcomponentaddedchange.h
+++ b/src/core/changes/qcomponentaddedchange.h
@@ -57,9 +57,9 @@ public:
                                    const QComponent *component);
     ~QComponentAddedChange();
 
-    QNodeId entityId() const Q_DECL_NOEXCEPT;
-    QNodeId componentId() const Q_DECL_NOEXCEPT;
-    const QMetaObject *componentMetaObject() const Q_DECL_NOEXCEPT;
+    QNodeId entityId() const Q_DECL_NOTHROW;
+    QNodeId componentId() const Q_DECL_NOTHROW;
+    const QMetaObject *componentMetaObject() const Q_DECL_NOTHROW;
 
 private:
     Q_DECLARE_PRIVATE(QComponentAddedChange)
diff --git a/src/core/changes/qcomponentremovedchange.cpp b/src/core/changes/qcomponentremovedchange.cpp
index 495bb6443..ebee3c582 100644
--- a/src/core/changes/qcomponentremovedchange.cpp
+++ b/src/core/changes/qcomponentremovedchange.cpp
@@ -66,19 +66,19 @@ QComponentRemovedChange::~QComponentRemovedChange()
 {
 }
 
-QNodeId QComponentRemovedChange::entityId() const Q_DECL_NOEXCEPT
+QNodeId QComponentRemovedChange::entityId() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentRemovedChange);
     return d->m_entityId;
 }
 
-QNodeId QComponentRemovedChange::componentId() const Q_DECL_NOEXCEPT
+QNodeId QComponentRemovedChange::componentId() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentRemovedChange);
     return d->m_componentId;
 }
 
-const QMetaObject *QComponentRemovedChange::componentMetaObject() const Q_DECL_NOEXCEPT
+const QMetaObject *QComponentRemovedChange::componentMetaObject() const Q_DECL_NOTHROW
 {
     Q_D(const QComponentRemovedChange);
     return d->m_componentMetaObject;
diff --git a/src/core/changes/qcomponentremovedchange.h b/src/core/changes/qcomponentremovedchange.h
index 0d968c6ff..3c57fe26f 100644
--- a/src/core/changes/qcomponentremovedchange.h
+++ b/src/core/changes/qcomponentremovedchange.h
@@ -57,9 +57,9 @@ public:
                                      const QComponent *component);
     ~QComponentRemovedChange();
 
-    QNodeId entityId() const Q_DECL_NOEXCEPT;
-    QNodeId componentId() const Q_DECL_NOEXCEPT;
-    const QMetaObject *componentMetaObject() const Q_DECL_NOEXCEPT;
+    QNodeId entityId() const Q_DECL_NOTHROW;
+    QNodeId componentId() const Q_DECL_NOTHROW;
+    const QMetaObject *componentMetaObject() const Q_DECL_NOTHROW;
 
 private:
     Q_DECLARE_PRIVATE(QComponentRemovedChange)
diff --git a/src/core/changes/qnodecreatedchange.cpp b/src/core/changes/qnodecreatedchange.cpp
index 4845b4faf..d3036981f 100644
--- a/src/core/changes/qnodecreatedchange.cpp
+++ b/src/core/changes/qnodecreatedchange.cpp
@@ -129,7 +129,7 @@ QNodeCreatedChangeBase::~QNodeCreatedChangeBase()
 /*!
  * \return parent id.
  */
-QNodeId QNodeCreatedChangeBase::parentId() const Q_DECL_NOEXCEPT
+QNodeId QNodeCreatedChangeBase::parentId() const Q_DECL_NOTHROW
 {
     Q_D(const QNodeCreatedChangeBase);
     return d->m_parentId;
@@ -138,7 +138,7 @@ QNodeId QNodeCreatedChangeBase::parentId() const Q_DECL_NOEXCEPT
 /*!
  * \return metaobject.
  */
-const QMetaObject *QNodeCreatedChangeBase::metaObject() const Q_DECL_NOEXCEPT
+const QMetaObject *QNodeCreatedChangeBase::metaObject() const Q_DECL_NOTHROW
 {
     Q_D(const QNodeCreatedChangeBase);
     return d->m_metaObject;
@@ -147,7 +147,7 @@ const QMetaObject *QNodeCreatedChangeBase::metaObject() const Q_DECL_NOEXCEPT
 /*!
  * \return node enabled.
  */
-bool QNodeCreatedChangeBase::isNodeEnabled() const Q_DECL_NOEXCEPT
+bool QNodeCreatedChangeBase::isNodeEnabled() const Q_DECL_NOTHROW
 {
     Q_D(const QNodeCreatedChangeBase);
     return d->m_nodeEnabled;
diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h
index 7318dada6..4b5e70b82 100644
--- a/src/core/changes/qnodecreatedchange.h
+++ b/src/core/changes/qnodecreatedchange.h
@@ -55,9 +55,9 @@ public:
     explicit QNodeCreatedChangeBase(const QNode *node);
     ~QNodeCreatedChangeBase();
 
-    QNodeId parentId() const Q_DECL_NOEXCEPT;
-    const QMetaObject *metaObject() const Q_DECL_NOEXCEPT;
-    bool isNodeEnabled() const Q_DECL_NOEXCEPT;
+    QNodeId parentId() const Q_DECL_NOTHROW;
+    const QMetaObject *metaObject() const Q_DECL_NOTHROW;
+    bool isNodeEnabled() const Q_DECL_NOTHROW;
 
 protected:
     QNodeCreatedChangeBase(QNodeCreatedChangeBasePrivate &dd, const QNode *node);
diff --git a/src/core/changes/qscenechange.cpp b/src/core/changes/qscenechange.cpp
index 99693dbf1..27b3e0a7b 100644
--- a/src/core/changes/qscenechange.cpp
+++ b/src/core/changes/qscenechange.cpp
@@ -117,19 +117,19 @@ QSceneChange::~QSceneChange()
 /*!
  * \return scene change type.
  */
-ChangeFlag QSceneChange::type() const Q_DECL_NOEXCEPT
+ChangeFlag QSceneChange::type() const Q_DECL_NOTHROW
 {
     Q_D(const QSceneChange);
     return d->m_type;
 }
 
-void QSceneChange::setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOEXCEPT
+void QSceneChange::setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOTHROW
 {
     Q_D(QSceneChange);
     d->m_deliveryFlags = flags;
 }
 
-QSceneChange::DeliveryFlags QSceneChange::deliveryFlags() const Q_DECL_NOEXCEPT
+QSceneChange::DeliveryFlags QSceneChange::deliveryFlags() const Q_DECL_NOTHROW
 {
     Q_D(const QSceneChange);
     return d->m_deliveryFlags;
@@ -138,7 +138,7 @@ QSceneChange::DeliveryFlags QSceneChange::deliveryFlags() const Q_DECL_NOEXCEPT
 /*!
  * \return scene change subject id.
  */
-QNodeId QSceneChange::subjectId() const Q_DECL_NOEXCEPT
+QNodeId QSceneChange::subjectId() const Q_DECL_NOTHROW
 {
     Q_D(const QSceneChange);
     return d->m_subjectId;
diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h
index bd7686a53..4555983e2 100644
--- a/src/core/changes/qscenechange.h
+++ b/src/core/changes/qscenechange.h
@@ -75,12 +75,12 @@ public:
 
     virtual ~QSceneChange();
 
-    ChangeFlag type() const Q_DECL_NOEXCEPT;
+    ChangeFlag type() const Q_DECL_NOTHROW;
 
-    void setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOEXCEPT;
-    DeliveryFlags deliveryFlags() const Q_DECL_NOEXCEPT;
+    void setDeliveryFlags(DeliveryFlags flags) Q_DECL_NOTHROW;
+    DeliveryFlags deliveryFlags() const Q_DECL_NOTHROW;
 
-    QNodeId subjectId() const Q_DECL_NOEXCEPT;
+    QNodeId subjectId() const Q_DECL_NOTHROW;
 
 protected:
     Q_DECLARE_PRIVATE(QSceneChange)
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index 8435bc961..6cac981ae 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -167,7 +167,7 @@ QBackendNode::~QBackendNode()
 /*!
  * Sets the peer \a id.
  */
-void QBackendNode::setPeerId(QNodeId id) Q_DECL_NOEXCEPT
+void QBackendNode::setPeerId(QNodeId id) Q_DECL_NOTHROW
 {
     Q_D(QBackendNode);
     d->m_peerId = id;
@@ -176,7 +176,7 @@ void QBackendNode::setPeerId(QNodeId id) Q_DECL_NOEXCEPT
 /*!
  * \return the peer id of the backend node.
  */
-QNodeId QBackendNode::peerId() const Q_DECL_NOEXCEPT
+QNodeId QBackendNode::peerId() const Q_DECL_NOTHROW
 {
     Q_D(const QBackendNode);
     return d->m_peerId;
@@ -185,7 +185,7 @@ QNodeId QBackendNode::peerId() const Q_DECL_NOEXCEPT
 /*!
  * \return \c true if the backend node is enabled.
  */
-bool QBackendNode::isEnabled() const Q_DECL_NOEXCEPT
+bool QBackendNode::isEnabled() const Q_DECL_NOTHROW
 {
     Q_D(const QBackendNode);
     return d->m_enabled;
@@ -194,7 +194,7 @@ bool QBackendNode::isEnabled() const Q_DECL_NOEXCEPT
 /*!
  * \return the mode of the backend mode.
  */
-QBackendNode::Mode QBackendNode::mode() const Q_DECL_NOEXCEPT
+QBackendNode::Mode QBackendNode::mode() const Q_DECL_NOTHROW
 {
     Q_D(const QBackendNode);
     return d->m_mode;
@@ -227,7 +227,7 @@ void QBackendNode::initializeFromPeer(const QNodeCreatedChangeBasePtr &change)
 /*!
  * Enables or disables the backend node by \a enabled.
  */
-void QBackendNode::setEnabled(bool enabled) Q_DECL_NOEXCEPT
+void QBackendNode::setEnabled(bool enabled) Q_DECL_NOTHROW
 {
     Q_D(QBackendNode);
     d->m_enabled = enabled;
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index 3522800ef..0baf1bb8a 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -134,12 +134,12 @@ inline QNodeIdVector qIdsForNodes(const T &nodes)
 
 struct QNodeIdTypePair
 {
-    QNodeIdTypePair() Q_DECL_NOEXCEPT
+    QNodeIdTypePair() Q_DECL_NOTHROW
         : id()
         , type(nullptr)
     {}
 
-    explicit QNodeIdTypePair(QNodeId _id, const QMetaObject *_type) Q_DECL_NOEXCEPT
+    explicit QNodeIdTypePair(QNodeId _id, const QMetaObject *_type) Q_DECL_NOTHROW
         : id(_id)
         , type(_type)
     {}
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h
index 33f1a39e5..c33638ce9 100644
--- a/src/core/nodes/qnodeid.h
+++ b/src/core/nodes/qnodeid.h
@@ -60,37 +60,37 @@ public:
 
     QT3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW;
 
-    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW
     {
         return m_id == 0;
     }
 
-    Q_DECL_CONSTEXPR bool operator ==(QNodeId other) const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR bool operator ==(QNodeId other) const Q_DECL_NOTHROW
     {
         return other.m_id == m_id;
     }
 
-    Q_DECL_CONSTEXPR bool operator !=(QNodeId other) const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR bool operator !=(QNodeId other) const Q_DECL_NOTHROW
     {
         return !operator ==(other);
     }
 
-    Q_DECL_CONSTEXPR bool operator <(QNodeId other) const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR bool operator <(QNodeId other) const Q_DECL_NOTHROW
     {
         return m_id < other.m_id;
     }
 
-    Q_DECL_CONSTEXPR bool operator >(QNodeId other) const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR bool operator >(QNodeId other) const Q_DECL_NOTHROW
     {
         return m_id > other.m_id;
     }
 
-    Q_DECL_CONSTEXPR quint64 id() const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR quint64 id() const Q_DECL_NOTHROW
     {
         return m_id;
     }
 
-    Q_DECL_CONSTEXPR operator bool() const Q_DECL_NOEXCEPT
+    Q_DECL_CONSTEXPR operator bool() const Q_DECL_NOTHROW
     {
         return m_id != 0;
     }
diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp
index bb5686d51..32dd14c6f 100644
--- a/src/plugins/sceneparsers/assimp/assimpio.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpio.cpp
@@ -125,7 +125,7 @@ const QString COLOR_ATTRIBUTE_NAME = QAttribute::defaultColorAttributeName();
 /*!
  * Returns a QMatrix4x4 from \a matrix;
  */
-QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) Q_DECL_NOEXCEPT
+QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix) Q_DECL_NOTHROW
 {
     return QMatrix4x4(matrix.a1, matrix.a2, matrix.a3, matrix.a4,
                       matrix.b1, matrix.b2, matrix.b3, matrix.b4,
@@ -141,7 +141,7 @@ static inline QString aiStringToQString(const aiString &str)
     return QString::fromUtf8(str.data, int(str.length));
 }
 
-QMaterial *createBestApproachingMaterial(const aiMaterial *assimpMaterial) Q_DECL_NOEXCEPT
+QMaterial *createBestApproachingMaterial(const aiMaterial *assimpMaterial)
 {
     aiString path; // unused but necessary
     const bool hasDiffuseTexture = (assimpMaterial->GetTexture(aiTextureType_DIFFUSE, 0, &path) == AI_SUCCESS);
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index 44a57e039..a8684f329 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -207,7 +207,7 @@ void Scene3DRenderer::synchronize()
     m_multisample = m_item->multisample();
 }
 
-void Scene3DRenderer::setSGNode(Scene3DSGNode *node) Q_DECL_NOEXCEPT
+void Scene3DRenderer::setSGNode(Scene3DSGNode *node)
 {
     m_node = node;
     if (!m_texture.isNull())
diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h
index 80045f66b..9ff5e7f36 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer_p.h
+++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h
@@ -84,7 +84,7 @@ public:
     QOpenGLFramebufferObject *createMultisampledFramebufferObject(const QSize &size);
     QOpenGLFramebufferObject *createFramebufferObject(const QSize &size);
     void scheduleRootEntityChange();
-    void setSGNode(Scene3DSGNode *node) Q_DECL_NOEXCEPT;
+    void setSGNode(Scene3DSGNode *node);
     void setCleanerHelper(Scene3DCleaner *cleaner);
     void synchronize();
 
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
index 0ff1bed27..f3817dc05 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h
@@ -65,13 +65,13 @@ class Scene3DSGMaterial : public QSGMaterial
 public:
     Scene3DSGMaterial();
 
-    void setTexture(QSGTexture *texture) Q_DECL_NOEXCEPT
+    void setTexture(QSGTexture *texture)
     {
         m_texture = texture;
         setFlag(Blending, m_texture ? m_texture->hasAlphaChannel() : false);
     }
 
-    QSGTexture *texture() const Q_DECL_NOEXCEPT { return m_texture; }
+    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(); }
 
diff --git a/src/quick3d/imports/scene3d/scene3dsgnode_p.h b/src/quick3d/imports/scene3d/scene3dsgnode_p.h
index f123ffdaa..f7b21e2b9 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_NOEXCEPT
+    void setTexture(QSGTexture *texture) Q_DECL_NOTHROW
     {
         m_material.setTexture(texture);
         m_opaqueMaterial.setTexture(texture);
         markDirty(DirtyMaterial);
     }
-    QSGTexture *texture() const Q_DECL_NOEXCEPT { return m_material.texture(); }
+    QSGTexture *texture() const Q_DECL_NOTHROW { return m_material.texture(); }
 
     void setRect(const QRectF &rect);
-    QRectF rect() const Q_DECL_NOEXCEPT { return m_rect; }
+    QRectF rect() const Q_DECL_NOTHROW { return m_rect; }
 
 private:
     Scene3DSGMaterial m_material;
diff --git a/src/render/backend/computecommand_p.h b/src/render/backend/computecommand_p.h
index c50354d37..9ce0e0975 100644
--- a/src/render/backend/computecommand_p.h
+++ b/src/render/backend/computecommand_p.h
@@ -70,9 +70,9 @@ public:
     void cleanup();
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    inline int x() const Q_DECL_NOEXCEPT { return m_workGroups[0]; }
-    inline int y() const Q_DECL_NOEXCEPT { return m_workGroups[1]; }
-    inline int z() const Q_DECL_NOEXCEPT { return m_workGroups[2]; }
+    inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
+    inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
+    inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index 2a0ef7151..c7a67a699 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -89,187 +89,187 @@ NodeManagers::NodeManagers()
 }
 
 template<>
-CameraManager *NodeManagers::manager<CameraLens>() const Q_DECL_NOEXCEPT
+CameraManager *NodeManagers::manager<CameraLens>() const Q_DECL_NOTHROW
 {
     return m_cameraManager;
 }
 
 template<>
-EntityManager *NodeManagers::manager<Entity>() const Q_DECL_NOEXCEPT
+EntityManager *NodeManagers::manager<Entity>() const Q_DECL_NOTHROW
 {
     return m_renderNodesManager;
 }
 
 template<>
-MaterialManager *NodeManagers::manager<Material>() const Q_DECL_NOEXCEPT
+MaterialManager *NodeManagers::manager<Material>() const Q_DECL_NOTHROW
 {
     return m_materialManager;
 }
 
 template<>
-MatrixManager *NodeManagers::manager<QMatrix4x4*>() const Q_DECL_NOEXCEPT
+MatrixManager *NodeManagers::manager<QMatrix4x4*>() const Q_DECL_NOTHROW
 {
     return m_worldMatrixManager;
 }
 
 template<>
-VAOManager *NodeManagers::manager<QOpenGLVertexArrayObject*>() const Q_DECL_NOEXCEPT
+VAOManager *NodeManagers::manager<QOpenGLVertexArrayObject*>() const Q_DECL_NOTHROW
 {
     return m_vaoManager;
 }
 
 template<>
-ShaderManager *NodeManagers::manager<Shader>() const Q_DECL_NOEXCEPT
+ShaderManager *NodeManagers::manager<Shader>() const Q_DECL_NOTHROW
 {
     return m_shaderManager;
 }
 
 template<>
-TechniqueManager *NodeManagers::manager<Technique>() const Q_DECL_NOEXCEPT
+TechniqueManager *NodeManagers::manager<Technique>() const Q_DECL_NOTHROW
 {
     return m_techniqueManager;
 }
 
 template<>
-EffectManager *NodeManagers::manager<Effect>() const Q_DECL_NOEXCEPT
+EffectManager *NodeManagers::manager<Effect>() const Q_DECL_NOTHROW
 {
     return m_effectManager;
 }
 
 template<>
-RenderPassManager *NodeManagers::manager<RenderPass>() const Q_DECL_NOEXCEPT
+RenderPassManager *NodeManagers::manager<RenderPass>() const Q_DECL_NOTHROW
 {
     return m_renderPassManager;
 }
 
 template<>
-TextureManager *NodeManagers::manager<Texture>() const Q_DECL_NOEXCEPT
+TextureManager *NodeManagers::manager<Texture>() const Q_DECL_NOTHROW
 {
     return m_textureManager;
 }
 
 template<>
-TextureDataManager *NodeManagers::manager<QTextureImageData>() const Q_DECL_NOEXCEPT
+TextureDataManager *NodeManagers::manager<QTextureImageData>() const Q_DECL_NOTHROW
 {
     return m_textureDataManager;
 }
 
 template<>
-LayerManager *NodeManagers::manager<Layer>() const Q_DECL_NOEXCEPT
+LayerManager *NodeManagers::manager<Layer>() const Q_DECL_NOTHROW
 {
     return m_layerManager;
 }
 
 template<>
-FilterKeyManager *NodeManagers::manager<FilterKey>() const Q_DECL_NOEXCEPT
+FilterKeyManager *NodeManagers::manager<FilterKey>() const Q_DECL_NOTHROW
 {
     return m_filterKeyManager;
 }
 
 template<>
-FrameGraphManager *NodeManagers::manager<FrameGraphNode*>() const Q_DECL_NOEXCEPT
+FrameGraphManager *NodeManagers::manager<FrameGraphNode*>() const Q_DECL_NOTHROW
 {
     return m_frameGraphManager;
 }
 
 template<>
-TransformManager *NodeManagers::manager<Transform>() const Q_DECL_NOEXCEPT
+TransformManager *NodeManagers::manager<Transform>() const Q_DECL_NOTHROW
 {
     return m_transformManager;
 }
 
 template<>
-RenderTargetManager *NodeManagers::manager<RenderTarget>() const Q_DECL_NOEXCEPT
+RenderTargetManager *NodeManagers::manager<RenderTarget>() const Q_DECL_NOTHROW
 {
     return m_renderTargetManager;
 }
 
 template<>
-SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOEXCEPT
+SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOTHROW
 {
     return m_sceneManager;
 }
 
 template<>
-AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT
+AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOTHROW
 {
     return m_attachmentManager;
 }
 
 template<>
-ParameterManager *NodeManagers::manager<Parameter>() const Q_DECL_NOEXCEPT
+ParameterManager *NodeManagers::manager<Parameter>() const Q_DECL_NOTHROW
 {
     return m_parameterManager;
 }
 
 template<>
-ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOEXCEPT
+ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOTHROW
 {
     return m_shaderDataManager;
 }
 
 template<>
-GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOEXCEPT
+GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOTHROW
 {
     return m_glBufferManager;
 }
 
 template<>
-TextureImageManager *NodeManagers::manager<TextureImage>() const Q_DECL_NOEXCEPT
+TextureImageManager *NodeManagers::manager<TextureImage>() const Q_DECL_NOTHROW
 {
     return m_textureImageManager;
 }
 
 template<>
-BufferManager *NodeManagers::manager<Buffer>() const Q_DECL_NOEXCEPT
+BufferManager *NodeManagers::manager<Buffer>() const Q_DECL_NOTHROW
 {
     return m_bufferManager;
 }
 
 template<>
-AttributeManager *NodeManagers::manager<Attribute>() const Q_DECL_NOEXCEPT
+AttributeManager *NodeManagers::manager<Attribute>() const Q_DECL_NOTHROW
 {
     return m_attributeManager;
 }
 
 template<>
-GeometryManager *NodeManagers::manager<Geometry>() const Q_DECL_NOEXCEPT
+GeometryManager *NodeManagers::manager<Geometry>() const Q_DECL_NOTHROW
 {
     return m_geometryManager;
 }
 
 template<>
-GeometryRendererManager *NodeManagers::manager<GeometryRenderer>() const Q_DECL_NOEXCEPT
+GeometryRendererManager *NodeManagers::manager<GeometryRenderer>() const Q_DECL_NOTHROW
 {
     return m_geometryRendererManager;
 }
 
 template<>
-ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOEXCEPT
+ObjectPickerManager *NodeManagers::manager<ObjectPicker>() const Q_DECL_NOTHROW
 {
     return m_objectPickerManager;
 }
 
 //template<>
-//BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOEXCEPT
+//BoundingVolumeDebugManager *NodeManagers::manager<BoundingVolumeDebug>() const Q_DECL_NOTHROW
 //{
 //    return m_boundingVolumeDebugManager;
 //}
 
 template<>
-LightManager *NodeManagers::manager<Light>() const Q_DECL_NOEXCEPT
+LightManager *NodeManagers::manager<Light>() const Q_DECL_NOTHROW
 {
     return m_lightManager;
 }
 
 template<>
-ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOEXCEPT
+ComputeCommandManager *NodeManagers::manager<ComputeCommand>() const Q_DECL_NOTHROW
 {
     return m_computeJobManager;
 }
 
 template<>
-RenderStateManager *NodeManagers::manager<RenderStateNode>() const Q_DECL_NOEXCEPT
+RenderStateManager *NodeManagers::manager<RenderStateNode>() const Q_DECL_NOTHROW
 {
     return m_renderStateManager;
 }
diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h
index 4938b9249..9a384d0ff 100644
--- a/src/render/backend/quniformvalue_p.h
+++ b/src/render/backend/quniformvalue_p.h
@@ -94,10 +94,10 @@ public:
     }
 
     void setType(UniformType type) Q_DECL_NOTHROW { m_type = type; }
-    UniformType type() Q_DECL_NOEXCEPT { return m_type; }
-    bool isTexture() const Q_DECL_NOEXCEPT { return m_type == TextureSampler; }
+    UniformType type() Q_DECL_NOTHROW { return m_type; }
+    bool isTexture() const Q_DECL_NOTHROW { return m_type == TextureSampler; }
 
-    void setValue(const QVariant &value) Q_DECL_NOEXCEPT
+    void setValue(const QVariant &value)
     {
         Q_ASSERT(m_type == Value);
         m_var = value;
@@ -109,31 +109,31 @@ public:
         return m_var;
     }
 
-    void setTextureUnit(int textureUnit) Q_DECL_NOEXCEPT
+    void setTextureUnit(int textureUnit)
     {
         Q_ASSERT(m_type == TextureSampler);
         m_textureIdUnit.m_textureUnit = textureUnit;
     }
 
-    int textureUnit() const Q_DECL_NOEXCEPT
+    int textureUnit() const
     {
         Q_ASSERT(m_type == TextureSampler);
         return m_textureIdUnit.m_textureUnit;
     }
 
-    void setTextureId(Qt3DCore::QNodeId textureId) Q_DECL_NOEXCEPT
+    void setTextureId(Qt3DCore::QNodeId textureId)
     {
         Q_ASSERT(m_type == TextureSampler);
         m_textureIdUnit.m_textureId = textureId;
     }
 
-    Qt3DCore::QNodeId textureId() const Q_DECL_NOEXCEPT
+    Qt3DCore::QNodeId textureId() const
     {
         Q_ASSERT(m_type == TextureSampler);
         return m_textureIdUnit.m_textureId;
     }
 
-    bool operator ==(const QUniformValue &other) Q_DECL_NOEXCEPT
+    bool operator ==(const QUniformValue &other)
     {
         if (other.m_type != m_type)
             return false;
@@ -149,7 +149,7 @@ public:
         return false;
     }
 
-    bool operator !=(const QUniformValue &other) Q_DECL_NOEXCEPT
+    bool operator !=(const QUniformValue &other)
     {
         return !operator ==(other);
     }
@@ -166,12 +166,12 @@ protected:
             , m_textureUnit(-1)
         {}
 
-        bool operator == (const TextureIdUnit &other) const Q_DECL_NOEXCEPT
+        bool operator == (const TextureIdUnit &other) const Q_DECL_NOTHROW
         {
             return (other.m_textureId == m_textureId) && (other.m_textureUnit == m_textureUnit);
         }
 
-        bool operator !=(const TextureIdUnit &other) const Q_DECL_NOEXCEPT
+        bool operator !=(const TextureIdUnit &other) const Q_DECL_NOTHROW
         {
             return !operator ==(other);
         }
diff --git a/src/render/backend/trianglesvisitor.cpp b/src/render/backend/trianglesvisitor.cpp
index 50a9a4046..3e8858b01 100644
--- a/src/render/backend/trianglesvisitor.cpp
+++ b/src/render/backend/trianglesvisitor.cpp
@@ -57,7 +57,7 @@ namespace Render {
 
 namespace {
 
-bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOEXCEPT
+bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) Q_DECL_NOTHROW
 {
     switch (type) {
     case Qt3DRender::QGeometryRenderer::Triangles:
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 724bce742..7f7cc6842 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -69,9 +69,9 @@ public:
     void cleanup();
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    inline int x() const Q_DECL_NOEXCEPT { return m_workGroups[0]; }
-    inline int y() const Q_DECL_NOEXCEPT { return m_workGroups[1]; }
-    inline int z() const Q_DECL_NOEXCEPT { return m_workGroups[2]; }
+    inline int x() const Q_DECL_NOTHROW { return m_workGroups[0]; }
+    inline int y() const Q_DECL_NOTHROW { return m_workGroups[1]; }
+    inline int z() const Q_DECL_NOTHROW { return m_workGroups[2]; }
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index d0c1533aa..4186e2b03 100644
--- a/src/render/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
@@ -89,7 +89,7 @@ void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     FrameGraphNode::sceneChangeEvent(e);
 }
 
-QNodeIdVector LayerFilterNode::layerIds() const Q_DECL_NOEXCEPT
+QNodeIdVector LayerFilterNode::layerIds() const
 {
     return m_layerIds;
 }
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index 029dd7bff..ef443dfd0 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -70,7 +70,7 @@ public:
     LayerFilterNode();
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    Qt3DCore::QNodeIdVector layerIds() const Q_DECL_NOEXCEPT;
+    Qt3DCore::QNodeIdVector layerIds() const;
     void setLayerIds(const Qt3DCore::QNodeIdVector &list);
 
 private:
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index 6602cd18b..7a7547deb 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -71,9 +71,9 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QSurface *surface() const { return m_surface; }
-    inline int width() const Q_DECL_NOEXCEPT { return m_width; }
-    inline int height() const Q_DECL_NOEXCEPT { return m_height; }
-    inline float devicePixelRatio() const Q_DECL_NOEXCEPT { return m_devicePixelRatio; }
+    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; }
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index 0f0a747ce..b13c0d5ae 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -98,7 +98,7 @@ QVariant Parameter::value() const
     return m_value;
 }
 
-int Parameter::nameId() const Q_DECL_NOEXCEPT
+int Parameter::nameId() const Q_DECL_NOTHROW
 {
     return m_nameId;
 }
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 0f4f83a52..c5c94243d 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -73,7 +73,7 @@ public:
 
     QString name() const;
     QVariant value() const;
-    int nameId() const Q_DECL_NOEXCEPT;
+    int nameId() const Q_DECL_NOTHROW;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 1d92b4f4d..db19a708c 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -83,10 +83,10 @@ public:
     void updateUniforms(GraphicsContext *ctx, const ShaderParameterPack &pack);
     void setFragOutputs(const QHash<QString, int> &fragOutputs);
 
-    inline QVector<int> uniformsNamesIds() const Q_DECL_NOEXCEPT { return m_uniformsNamesIds; }
-    inline QVector<int> uniformBlockNamesIds() const Q_DECL_NOEXCEPT { return m_uniformBlockNamesIds; }
-    inline QVector<int> storageBlockNamesIds() const Q_DECL_NOEXCEPT { return m_shaderStorageBlockNamesIds; }
-    inline QVector<int> attributeNamesIds() const Q_DECL_NOEXCEPT { return m_attributeNamesIds; }
+    inline QVector<int> uniformsNamesIds() const { return m_uniformsNamesIds; }
+    inline QVector<int> uniformBlockNamesIds() const { return m_uniformBlockNamesIds; }
+    inline QVector<int> storageBlockNamesIds() const { return m_shaderStorageBlockNamesIds; }
+    inline QVector<int> attributeNamesIds() const { return m_attributeNamesIds; }
 
     QVector<QString> uniformsNames() const;
     QVector<QString> attributesNames() const;
@@ -95,13 +95,13 @@ public:
     QVector<QByteArray> shaderCode() const;
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    bool isLoaded() const Q_DECL_NOEXCEPT { return m_isLoaded; }
-    ProgramDNA dna() const Q_DECL_NOEXCEPT { return m_dna; }
+    bool isLoaded() const Q_DECL_NOTHROW { return m_isLoaded; }
+    ProgramDNA dna() const Q_DECL_NOTHROW { return m_dna; }
 
-    inline QVector<ShaderUniform> uniforms() const Q_DECL_NOEXCEPT { return m_uniforms; }
-    inline QVector<ShaderAttribute> attributes() const Q_DECL_NOEXCEPT { return m_attributes; }
-    inline QVector<ShaderUniformBlock> uniformBlocks() const Q_DECL_NOEXCEPT { return m_uniformBlocks; }
-    inline QVector<ShaderStorageBlock> storageBlocks() const Q_DECL_NOEXCEPT { return m_shaderStorageBlocks; }
+    inline QVector<ShaderUniform> uniforms() const { return m_uniforms; }
+    inline QVector<ShaderAttribute> attributes() const { return m_attributes; }
+    inline QVector<ShaderUniformBlock> uniformBlocks() const { return m_uniformBlocks; }
+    inline QVector<ShaderStorageBlock> storageBlocks() const { return m_shaderStorageBlocks; }
 
     QHash<QString, ShaderUniform> activeUniformsForUniformBlock(int blockIndex) const;
 
diff --git a/src/render/renderstates/genericstate_p.h b/src/render/renderstates/genericstate_p.h
index 8155288db..27db8eb6c 100644
--- a/src/render/renderstates/genericstate_p.h
+++ b/src/render/renderstates/genericstate_p.h
@@ -111,7 +111,7 @@ public:
      * number of values, e.g. when they are using arbitrary floats
      * Default: true
      */
-    virtual bool isPooledImpl() const Q_DECL_NOEXCEPT;
+    virtual bool isPooledImpl() const Q_DECL_NOTHROW;
 
     /*!
      * \brief Return pointer to pooled object with given property change
diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp
index a92072da6..89bc596dd 100644
--- a/src/render/renderstates/renderstates.cpp
+++ b/src/render/renderstates/renderstates.cpp
@@ -57,7 +57,7 @@ void RenderStateImpl::updateProperty(const char *name, const QVariant &value)
     Q_UNUSED(value);
 }
 
-bool RenderStateImpl::isPooledImpl() const Q_DECL_NOEXCEPT
+bool RenderStateImpl::isPooledImpl() const Q_DECL_NOTHROW
 {
     return true;
 }
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h
index ad6ef4ad1..6fc8e6259 100644
--- a/src/render/renderstates/renderstates_p.h
+++ b/src/render/renderstates/renderstates_p.h
@@ -165,7 +165,7 @@ class Q_AUTOTEST_EXPORT ScissorTest : public GenericState4<ScissorTest, ScissorS
 {
 public:
     virtual void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    bool isPooledImpl() const Q_DECL_NOEXCEPT Q_DECL_OVERRIDE { return false; }
+    bool isPooledImpl() const Q_DECL_NOTHROW Q_DECL_OVERRIDE { return false; }
     void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
@@ -186,7 +186,7 @@ class Q_AUTOTEST_EXPORT PointSize : public GenericState2<PointSize, PointSizeMas
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    bool isPooledImpl() const Q_DECL_NOEXCEPT Q_DECL_OVERRIDE { return false; }
+    bool isPooledImpl() const Q_DECL_NOTHROW Q_DECL_OVERRIDE { return false; }
     void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
@@ -194,7 +194,7 @@ class Q_AUTOTEST_EXPORT PolygonOffset : public GenericState2<PolygonOffset, Poly
 {
 public:
     void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE;
-    bool isPooledImpl() const Q_DECL_NOEXCEPT Q_DECL_OVERRIDE { return false; }
+    bool isPooledImpl() const Q_DECL_NOTHROW Q_DECL_OVERRIDE { return false; }
     void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE;
 };