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/qmaterial.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/qmaterial.h')
| -rw-r--r-- | src/render/materialsystem/qmaterial.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index ca44901c1..cfc3c0d99 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -52,13 +52,13 @@ class QMaterialPrivate; class QEffect; typedef QMap<QString, QAbstractTextureProvider*> TextureDict; -class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged) public: - explicit QMaterial(Qt3D::QNode *parent = 0); + explicit QMaterial(Qt3DCore::QNode *parent = 0); ~QMaterial(); void setEffect(QEffect *effect); @@ -76,8 +76,8 @@ Q_SIGNALS: void effectChanged(); protected: - QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QMaterial) |