diff options
| author | Albert Astals Cid <aacid@kde.org> | 2014-08-09 16:18:01 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-08-14 10:58:20 +0200 |
| commit | 2f494803578475732dcffcd12fe5ba3b4b1c521b (patch) | |
| tree | e0603d0661e45ba95554b99d901e2e08b3557c05 /src/quick/items/qquickshadereffectnode_p.h | |
| parent | da9c41a72975db20425a80741da4eb5c0d2dfd65 (diff) | |
Add Q_DECL_OVERRIDE
Change-Id: I2e64950aef710f943c3bc50bc9bf8a1f7fb58d28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/quick/items/qquickshadereffectnode_p.h')
| -rw-r--r-- | src/quick/items/qquickshadereffectnode_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index 53c2cb9694..20fcc0e43e 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -94,9 +94,9 @@ public: }; explicit QQuickShaderEffectMaterial(QQuickShaderEffectNode *node = 0); - virtual QSGMaterialType *type() const; - virtual QSGMaterialShader *createShader() const; - virtual int compare(const QSGMaterial *other) const; + QSGMaterialType *type() const Q_DECL_OVERRIDE; + QSGMaterialShader *createShader() const Q_DECL_OVERRIDE; + int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE; QVector<QByteArray> attributes; QVector<UniformData> uniforms[QQuickShaderEffectMaterialKey::ShaderTypeCount]; @@ -136,7 +136,7 @@ public: QQuickShaderEffectNode(); virtual ~QQuickShaderEffectNode(); - virtual void preprocess(); + void preprocess() Q_DECL_OVERRIDE; Q_SIGNALS: void logAndStatusChanged(const QString &, int status); |