Merge remote-tracking branch 'origin/7.0' into 8.0

Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20
2022-06-07 10:28:37 +02:00
parent 13146fb0bd 62ff1c9b52
commit 84ff5eb169
32 changed files with 341 additions and 43 deletions
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
@@ -252,7 +252,6 @@ void MaterialBrowserView::importsChanged(const QList<Import> &addedImports, cons

    m_hasQuick3DImport = hasQuick3DImport;
    refreshModel();
-
 }

 void MaterialBrowserView::customNotification(const AbstractView *view, const QString &identifier,