QmlDesigner: Add scene root material support to material editor/browser

If the scene root item is Material subclass, material library is not
created for the scene. Material editor and browser functionalities that
relate to having material library are disabled.
Material editor will always show the material that is the scene root.

Fixes: QDS-7374
Change-Id: Icd1c212c17b59e4a2caa6b3b4d7e615e68b21eb9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>

1 files changed, 7 insertions, 17 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 365aca3cd3..dae4f975b4 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -342,24 +342,14 @@ void Qt5InformationNodeInstanceServer::resolveImportSupport()
 void Qt5InformationNodeInstanceServer::updateMaterialPreviewData(const QVector<PropertyValueContainer> &valueChanges)
 {
     const PropertyName matPrevPrefix("matPrev");
-    qint32 materialLibraryId = -1;
     for (const auto &container : valueChanges) {
-        if (container.name().startsWith(matPrevPrefix)) {
-            if (!hasInstanceForId(container.instanceId()))
-                continue;
-            if (materialLibraryId < 0) {
-                ServerNodeInstance instance = instanceForId(container.instanceId());
-                if (instance.id() == "__materialLibrary__")
-                    materialLibraryId = container.instanceId();
-            }
-            if (container.instanceId() == materialLibraryId) {
-                if (container.name() == "matPrevEnv")
-                    m_materialPreviewData.env = container.value().toString();
-                else if (container.name() == "matPrevEnvValue")
-                    m_materialPreviewData.envValue = container.value().toString();
-                else if (container.name() == "matPrevModel")
-                    m_materialPreviewData.model = container.value().toString();
-            }
+        if (container.instanceId() == 0) {
+            if (container.name() == "matPrevEnv")
+                m_materialPreviewData.env = container.value().toString();
+            else if (container.name() == "matPrevEnvValue")
+                m_materialPreviewData.envValue = container.value().toString();
+            else if (container.name() == "matPrevModel")
+                m_materialPreviewData.model = container.value().toString();
         }
     }
 }