QShaderData: fix texture support in properties

There was only code dealing with sub-shader data but nothing allowing to
check if a property was a texture, this is now properly handled.

Change-Id: I48984727eff975e9f3e2c21c5185b336efc963fd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index dbf351695..1287f1603 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -84,11 +84,9 @@ public:
                 }
             }
             return innerValues;
-        } else if (v.userType() == quick3DShaderDataTypeId) {
-            Qt3DCore::QNodeId id;
-            QShaderData *shaderData = v.value<Quick3DShaderData *>();
-            if (shaderData)
-                id = shaderData->id();
+        } else if (v.canConvert<Qt3DCore::QNode*>()) {
+            const auto node = v.value<Qt3DCore::QNode *>();
+            const auto id = Qt3DCore::qIdForNode(node);
             return QVariant::fromValue(id);
         }
         return v;