summaryrefslogtreecommitdiffstats
path: root/src/render/lights
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2016-04-26 10:39:23 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-04-28 07:51:01 +0000
commit1499360ad27bde001fb5e3786600b364ff081fb7 (patch)
tree1d538227a15d3b67410d187e8b13c958f06fdd95 /src/render/lights
parentf7373db7cc6bee5d1d6c8a5804d0a53751966c54 (diff)
Make the type property read-only on QAbstractLight
Change-Id: Ibef172f08ac22af9817c0db8ec8042be78acf494 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.cpp9
-rw-r--r--src/render/lights/qabstractlight.h4
2 files changed, 1 insertions, 12 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index 604fdf4eb..203b99888 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -95,15 +95,6 @@ QAbstractLight::Type QAbstractLight::type() const
return d->m_type;
}
-void QAbstractLight::setType(Type type)
-{
- Q_D(QAbstractLight);
- if (d->m_type != type) {
- d->m_type = type;
- emit typeChanged(type);
- }
-}
-
/*!
* \property Qt3DRender::QAbstractLight::color
*
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index 15a7ed069..cf456f057 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -55,7 +55,7 @@ class QAbstractLightPrivate;
class QT3DRENDERSHARED_EXPORT QAbstractLight : public QShaderData
{
Q_OBJECT
- Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged)
+ Q_PROPERTY(Type type READ type)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
Q_PROPERTY(float intensity READ intensity WRITE setIntensity NOTIFY intensityChanged)
@@ -74,7 +74,6 @@ public :
float intensity() const;
public Q_SLOTS:
- void setType(Type type);
void setColor(const QColor &color);
void setIntensity(float intensity);
@@ -83,7 +82,6 @@ protected :
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
Q_SIGNALS:
- void typeChanged(Type type);
void colorChanged(const QColor &color);
void intensityChanged(float intensity);