QAbstractLight now inherits directly QComponent

We are turning the relationship between QAbstractLight and QShaderData
from a "is-a" to a "has-a". For that we relay all the properties of the
light to its internal shader data dynamic properties.

Interestingly it also removes a couple of special handling for lights
which aren't needed anymore.

Change-Id: Ia937b8934f94ce318e02901d90ac340e172cbc75
Task-number: QTBUG-51489
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index ca00a5108..36bab9966 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
@@ -60,12 +60,12 @@ PointLightBlock::~PointLightBlock()
 {
 }
 
-QVector<Qt3DRender::QShaderData *> PointLightBlock::lights() const
+QVector<Qt3DRender::QAbstractLight *> PointLightBlock::lights() const
 {
     return m_lights;
 }
 
-void PointLightBlock::addLight(Qt3DRender::QShaderData *light)
+void PointLightBlock::addLight(Qt3DRender::QAbstractLight *light)
 {
     m_lights.append(light);
     emit lightsChanged();
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index f2c664fad..9c93528c8 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -51,24 +51,25 @@
 #ifndef POINTLIGHTBLOCK_H
 #define POINTLIGHTBLOCK_H
 
+#include <Qt3DRender/QAbstractLight>
 #include <Qt3DRender/QShaderData>
 
 class PointLightBlock : public Qt3DRender::QShaderData
 {
     Q_OBJECT
-    Q_PROPERTY(QVector<QShaderData *> lights READ lights NOTIFY lightsChanged)
+    Q_PROPERTY(QVector<Qt3DRender::QAbstractLight *> lights READ lights NOTIFY lightsChanged)
 public:
     explicit PointLightBlock(Qt3DCore::QNode *parent = 0);
     ~PointLightBlock();
 
-    QVector<Qt3DRender::QShaderData *> lights() const;
-    void addLight(Qt3DRender::QShaderData *light);
+    QVector<Qt3DRender::QAbstractLight *> lights() const;
+    void addLight(Qt3DRender::QAbstractLight *light);
 
 Q_SIGNALS:
     void lightsChanged();
 
 private:
-    QVector<Qt3DRender::QShaderData *> m_lights;
+    QVector<Qt3DRender::QAbstractLight *> m_lights;
 };
 
 #endif // POINTLIGHTBLOCK_H