From 15dace7c02bc5acdf02f94c8be08fec1a792383c Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Thu, 19 May 2016 17:16:37 +0200 Subject: Replace Q_DECL_NOEXCEPT by Q_DECL_NOTHROW Change-Id: Ia991da557483704055e0ccf17b4a6b273568a1ba Reviewed-by: Sean Harmer Reviewed-by: Marc Mutz --- src/quick3d/imports/scene3d/scene3dsgmaterial_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick3d/imports/scene3d/scene3dsgmaterial_p.h') 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(); } -- cgit v1.2.3