diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-10-21 13:36:29 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-10-21 10:58:50 +0000 |
commit | f496970002e2374d5405be28a79cfcacd0443897 (patch) | |
tree | d718e41ee4ac78419cafc402f59f03b0a8b92851 | |
parent | bad166cda85ee9e055f7e9c098a811b58114d984 (diff) | |
download | qt-creator-f496970002e2374d5405be28a79cfcacd0443897.tar.gz |
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>
-rw-r--r-- | src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp index cb3a295259..86f8f7d194 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 §io } } 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 015b76630c..979ae3a7ae 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); } } |