diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-04-26 10:53:20 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-28 07:51:03 +0000 |
| commit | 70e76a457cb570e95ab8f96aad4634687a8f2a18 (patch) | |
| tree | 4e06c374b5b2eff667edfcad6277decad4a83b3a /src/render/lights | |
| parent | 1499360ad27bde001fb5e3786600b364ff081fb7 (diff) | |
Prevent QAbstractLight instances creation
Change-Id: I7cd0f780e0ca411f9b3a210989952eccf236554e
Task-number: QTBUG-51489
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/lights')
| -rw-r--r-- | src/render/lights/qabstractlight.cpp | 8 | ||||
| -rw-r--r-- | src/render/lights/qabstractlight.h | 3 | ||||
| -rw-r--r-- | src/render/lights/qabstractlight_p.h | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 203b99888..87aa6a633 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -75,14 +75,6 @@ void QAbstractLight::copy(const QNode *ref) \inmodule Qt3DRender */ -/*! - * Constructs a new QAbstractLight with the given \a parent. - */ -QAbstractLight::QAbstractLight(Qt3DCore::QNode *parent) : - QShaderData(*new QAbstractLightPrivate(PointLight), parent) -{ -} - /*! \internal */ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent) : QShaderData(dd, parent) diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index cf456f057..c94ce0af7 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -67,8 +67,6 @@ public : }; Q_ENUM(Type) - explicit QAbstractLight(Qt3DCore::QNode *parent = Q_NULLPTR); - Type type() const; QColor color() const; float intensity() const; @@ -87,7 +85,6 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QAbstractLight) - QT3D_CLONEABLE(QAbstractLight) }; } // namespace Qt3DRender diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h index 3f3b4cc0d..d605951ac 100644 --- a/src/render/lights/qabstractlight_p.h +++ b/src/render/lights/qabstractlight_p.h @@ -59,7 +59,7 @@ namespace Qt3DRender { class QAbstractLight; -class QAbstractLightPrivate : public QShaderDataPrivate +class Q_AUTOTEST_EXPORT QAbstractLightPrivate : public QShaderDataPrivate { public: QAbstractLightPrivate(QAbstractLight::Type type); |