From 4667d8ae4eed6cb6a6b139b34b9f9b8b8f6ed8a5 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Tue, 18 Oct 2022 12:23:27 +0300
Subject: [PATCH] QmlDesigner: Disable "add material" actions when QtQuick3D
 not imported

Fixes: QDS-7516
Change-Id: Id92a76e455b17b6c7baa11f8e472fa0b6bfcde9f
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
index 19458a93f55..ce9f7d16e3d 100644
--- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
+++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
@@ -76,8 +76,8 @@ Item {
             var userMatsSecBottom = mapFromItem(userMaterialsSection, 0, userMaterialsSection.y).y
                                     + userMaterialsSection.height;
 
-            if (!materialBrowserModel.hasMaterialRoot && (!materialBrowserBundleModel.matBundleExists
-                                                          || mouse.y < userMatsSecBottom)) {
+            if (!materialBrowserModel.hasMaterialRoot && materialBrowserModel.hasQuick3DImport
+                && (!materialBrowserBundleModel.matBundleExists || mouse.y < userMatsSecBottom)) {
                 root.currentMaterial = null
                 ctxMenu.popup()
             }
@@ -288,6 +288,7 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
                 buttonSize: searchBox.height
                 onClicked: materialBrowserModel.addNewMaterial()
+                enabled: materialBrowserModel.hasQuick3DImport
             }
         }