From 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Oct 2015 20:45:19 +0100 Subject: Move Qt3DCore into Qt3DCore namespace Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire --- src/render/materialsystem/qparameter.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/render/materialsystem/qparameter.h') diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index 03883f5f1..b0a9c9b2e 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -48,17 +48,17 @@ namespace Qt3DRender { class QParameterPrivate; class QAbstractTextureProvider; -class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode +class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: - explicit QParameter(Qt3D::QNode *parent = 0); + explicit QParameter(Qt3DCore::QNode *parent = 0); ~QParameter(); - QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0); - QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0); + QParameter(const QString& name, const QVariant& value, Qt3DCore::QNode* parent = 0); + QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0); void setName(const QString &name); QString name() const; @@ -75,8 +75,8 @@ Q_SIGNALS: void nameChanged(); protected: - QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QParameter) -- cgit v1.2.3