From 6d2806c6ed460ba5de1aba9961efe6bc4c0935a4 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Tue, 20 Sep 2022 16:45:26 +0300
Subject: [PATCH] QmlDesigner: Search for material bundle folder near
 executable

Fixes: QDS-7717
Change-Id: I33405d0be6d55550d79fc371c6d82760ec6fa5b3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../materialbrowserbundlemodel.cpp            | 24 +++++++++++++------
 .../materialbrowserbundlemodel.h              |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.cpp
index cab5bc869d1..1632fc14fab 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.cpp
@@ -30,6 +30,7 @@
 #include "bundlematerialcategory.h"
 #include "utils/qtcassert.h"
 
+#include <QCoreApplication>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QUrl>
@@ -82,15 +83,24 @@ QHash<int, QByteArray> MaterialBrowserBundleModel::roleNames() const
 
 void MaterialBrowserBundleModel::loadMaterialBundle()
 {
-    if (m_matBundleExists)
+    if (m_matBundleExists || m_probeMatBundleDir)
         return;
 
-    QString bundlePath = qEnvironmentVariable("MATERIAL_BUNDLE_PATH");
+    QDir matBundleDir(qEnvironmentVariable("MATERIAL_BUNDLE_PATH"));
 
-    if (bundlePath.isEmpty())
-        return;
+    // search for matBundleDir from exec dir and up
+    if (matBundleDir.dirName() == ".") {
+        m_probeMatBundleDir = true; // probe only once
 
-    QString matBundlePath = bundlePath + "material_bundle.json";
+        matBundleDir.setPath(QCoreApplication::applicationDirPath());
+        while (!matBundleDir.cd("material_bundle") && matBundleDir.cdUp())
+            ; // do nothing
+
+        if (matBundleDir.dirName() != "material_bundle") // bundlePathDir not found
+            return;
+    }
+
+    QString matBundlePath = matBundleDir.filePath("material_bundle.json");
 
     if (m_matBundleObj.isEmpty()) {
         QFile matPropsFile(matBundlePath);
@@ -127,7 +137,7 @@ void MaterialBrowserBundleModel::loadMaterialBundle()
                 files.append(asset.toString());
 
             auto bundleMat = new BundleMaterial(category, mat, matObj.value("qml").toString(),
-                                                QUrl::fromLocalFile(bundlePath + matObj.value("icon").toString()), files);
+                                                QUrl::fromLocalFile(matBundleDir.filePath(matObj.value("icon").toString())), files);
 
             category->addBundleMaterial(bundleMat);
         }
@@ -139,7 +149,7 @@ void MaterialBrowserBundleModel::loadMaterialBundle()
     for (const QJsonValueRef &file : sharedFilesArr)
         sharedFiles.append(file.toString());
 
-    m_importer = new Internal::BundleImporter(bundlePath, "MaterialBundle", sharedFiles);
+    m_importer = new Internal::BundleImporter(matBundleDir.path(), "MaterialBundle", sharedFiles);
     connect(m_importer, &Internal::BundleImporter::importFinished, this, [&](const QmlDesigner::NodeMetaInfo &metaInfo) {
         if (metaInfo.isValid())
             emit addBundleMaterialToProjectRequested(metaInfo);
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.h b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.h
index 47d201a8293..60b48f1c9b9 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.h
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserbundlemodel.h
@@ -92,6 +92,7 @@ private:
     bool m_hasQuick3DImport = false;
     bool m_hasMaterialRoot = false;
     bool m_matBundleExists = false;
+    bool m_probeMatBundleDir = false;
 };
 
 } // namespace QmlDesigner