diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-26 13:18:50 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-05 08:56:00 +0000 |
| commit | 00bd10a944e7d665abe356bb43e8c92d5ee0a7f4 (patch) | |
| tree | b829a2beea9e301433c360fa74daabe61229858d /src | |
| parent | 0d286b457646d2a2f780c149779d4618453c2bae (diff) | |
QEffect: make add/removeTechnique non virtual
Change-Id: I5a0affa4b8dc43a9df6bb78eb163ea160db021c5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/materialsystem/qeffect.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 7b851d1db..cf9ed6631 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -51,8 +51,7 @@ class QParameter; class QTechnique; class QEffectPrivate; -class QT3DRENDERSHARED_EXPORT QEffect - : public Qt3DCore::QNode +class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode { Q_OBJECT public: @@ -63,8 +62,8 @@ public: void removeParameter(QParameter *parameter); QList<QParameter *> parameters() const; - virtual void addTechnique(QTechnique *t); - virtual void removeTechnique(QTechnique *t); + void addTechnique(QTechnique *t); + void removeTechnique(QTechnique *t); QList<QTechnique *> techniques() const; protected: |