Merge remote-tracking branch 'origin/8.0'

Change-Id: Iea4fd2949f5d5345802e2e7d9283d72c6c55f69f
2022-08-03 10:52:13 +02:00
parent c6399adf48 c1d75d8df7
commit 8a44294821
16 changed files with 180 additions and 65 deletions
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
@@ -138,6 +138,8 @@ bool MaterialBrowserView::isMaterial(const ModelNode &node) const

 void MaterialBrowserView::modelAboutToBeDetached(Model *model)
 {
+    m_widget->materialBrowserModel()->setMaterials({}, m_hasQuick3DImport);
+
    AbstractView::modelAboutToBeDetached(model);
 }