diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-20 20:57:43 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-22 14:31:24 +0000 |
commit | c4274f6e98e29c1399120bdd8db86770d6bba104 (patch) | |
tree | 9c3e905386cd9bf6b01e32cc1835d7263eb9070d /src/qtmultimediaquicktools/qsgvideonode_yuv.cpp | |
parent | bb6166a5eca14550584bfc4ab4cb4130872df3ad (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qsgvideonode_yuv.cpp')
-rw-r--r-- | src/qtmultimediaquicktools/qsgvideonode_yuv.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp index 38b5af943..54d6dec97 100644 --- a/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp +++ b/src/qtmultimediaquicktools/qsgvideonode_yuv.cpp @@ -120,9 +120,9 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/uyvyvideo.frag")); } - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE; + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; - char const *const *attributeNames() const Q_DECL_OVERRIDE { + char const *const *attributeNames() const override { static const char *names[] = { "qt_VertexPosition", "qt_VertexTexCoord", @@ -132,7 +132,7 @@ public: } protected: - void initialize() Q_DECL_OVERRIDE { + void initialize() override { m_id_matrix = program()->uniformLocation("qt_Matrix"); m_id_yuvtexture = program()->uniformLocation("yuvTexture"); m_id_imageWidth = program()->uniformLocation("imageWidth"); |