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>

1 files changed, 1 insertions, 5 deletions

diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index b23c3017a..8ecfa86ec 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -110,11 +110,7 @@ void ShaderData::initializeFromPeer(const QNodeCreatedChangeBasePtr &change)
 
 ShaderData *ShaderData::lookupResource(NodeManagers *managers, QNodeId id)
 {
-    ShaderData *shaderData = managers->shaderDataManager()->lookupResource(id);
-    if (!shaderData)
-        shaderData = managers->lightManager()->lookupResource(id);
-
-    return shaderData;
+    return managers->shaderDataManager()->lookupResource(id);
 }
 
 ShaderData *ShaderData::lookupResource(QNodeId id)