From f496970002e2374d5405be28a79cfcacd0443897 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Fri, 21 Oct 2022 13:36:29 +0300
Subject: [PATCH] QmlDesigner: Don't copy/remove data property when copying all

'data' property contains node's children, so it should be ignored
during the 'copy all properties' operation.

Change-Id: Ib056409c9ad0a42ebc40f751173b7a3455d912c6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 .../components/materialbrowser/materialbrowsermodel.cpp         | 1 +
 .../components/materialbrowser/materialbrowserview.cpp          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
index cb3a295259b..86f8f7d1948 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
@@ -403,6 +403,7 @@ void MaterialBrowserModel::copyMaterialProperties(int idx, const QString &sectio
         }
     }
     validProps.remove("objectName");
+    validProps.remove("data");
 
     if (m_allPropsCopied || dynamicPropsCopied || m_propertyGroupsObj.empty()) {
         copiedProps = validProps.values();
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
index 015b76630c7..979ae3a7ae1 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
@@ -123,7 +123,7 @@ WidgetInfo MaterialBrowserView::widgetInfo()
                         }
                     }
                     for (const PropertyName &propName : qAsConst(propNames)) {
-                        if (propName != "objectName")
+                        if (propName != "objectName" && propName != "data")
                             mat.removeProperty(propName);
                     }
                 }