diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-05-19 17:16:37 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-23 11:59:53 +0000 |
| commit | 15dace7c02bc5acdf02f94c8be08fec1a792383c (patch) | |
| tree | f91b48a3860d21c2e3574765ad66b362c0563306 /src/quick3d/imports/scene3d/scene3dsgmaterial_p.h | |
| parent | e53a337637a3534fd9b94156d3db2cf0a11abb10 (diff) | |
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>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3dsgmaterial_p.h')
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterial_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |