From 1d9c7e071e47f2537f776d3cc10e1675bea708d3 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 31 Aug 2022 10:24:05 +0200 Subject: [PATCH] QmlDesigner: Use new validation approach in material browser Many validation tests can now be skipped. Task-number: QDS-7454 Change-Id: I01c37ff9747260940400043d2a0e39bb2700ee5b Reviewed-by: Miikka Heikkinen --- .../components/materialbrowser/materialbrowserview.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index cff890f7e4e..f0bdf4d9063 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -223,9 +223,6 @@ void MaterialBrowserView::refreshModel(bool updateImages) bool MaterialBrowserView::isMaterial(const ModelNode &node) const { - if (!node.isValid()) - return false; - return node.metaInfo().isQtQuick3DMaterial(); } @@ -298,8 +295,8 @@ void MaterialBrowserView::nodeReparented(const ModelNode &node, ModelNode newParentNode = newPropertyParent.parentModelNode(); ModelNode oldParentNode = oldPropertyParent.parentModelNode(); - bool matAdded = newParentNode.isValid() && newParentNode.id() == Constants::MATERIAL_LIB_ID; - bool matRemoved = oldParentNode.isValid() && oldParentNode.id() == Constants::MATERIAL_LIB_ID; + bool matAdded = newParentNode.id() == Constants::MATERIAL_LIB_ID; + bool matRemoved = oldParentNode.id() == Constants::MATERIAL_LIB_ID; if (matAdded || matRemoved) { if (matAdded && !m_puppetResetPending) { @@ -316,7 +313,7 @@ void MaterialBrowserView::nodeReparented(const ModelNode &node, void MaterialBrowserView::nodeAboutToBeRemoved(const ModelNode &removedNode) { // removing the material editor node - if (removedNode.isValid() && removedNode.id() == Constants::MATERIAL_LIB_ID) { + if (removedNode.id() == Constants::MATERIAL_LIB_ID) { m_widget->materialBrowserModel()->setMaterials({}, m_hasQuick3DImport); return; }