diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
| commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
| tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/materialsystem/qeffect.h | |
| parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) | |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qeffect.h')
| -rw-r--r-- | src/render/materialsystem/qeffect.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index 164a6392a..be1d4a21b 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -49,11 +49,11 @@ class QTechnique; class QEffectPrivate; class QT3DRENDERERSHARED_EXPORT QEffect - : public Qt3D::QNode + : public Qt3DCore::QNode { Q_OBJECT public: - explicit QEffect(Qt3D::QNode *parent = 0); + explicit QEffect(Qt3DCore::QNode *parent = 0); ~QEffect(); void addParameter(QParameter *parameter); @@ -65,8 +65,8 @@ public: QList<QTechnique *> techniques() const; protected: - QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QEffect) |