From ac3d8ce21b6a37ceb6f482f948568c3b3209a27e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 4 Jun 2025 13:26:38 +0200 Subject: [PATCH] QmlDesigner: Skip Dependencies folder for resources This folder is only part of the CMake project. Task-number: QDS-15037 Change-Id: Ia7d723adfb54f42205b8dcdcb601127508cd7dc1 Reviewed-by: Tim Jenssen (cherry picked from commit 1a3998e51c7a9de039001dfabdada8e6024d8b61) --- .../propertyeditor/fileresourcesmodel.cpp | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp index 2942ca86c76..ad4a4e3cde6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp @@ -183,7 +183,27 @@ QVariant FileResourcesModel::modelNodeBackend() const return QVariant(); } +<<<<<<< HEAD (a2c8a1 Core: fix rare crash in GeneralSettingsWidget::apply()) bool filterMetaIcons(const QString &fileName) +======= +static bool checkIgnoreFile(const QString &fileName) +{ + QFileInfo info(fileName); + + QDir currentDir = info.dir(); + + while (!currentDir.isRoot() && currentDir.path().contains("Dependencies")) { + if (QFileInfo(currentDir.absoluteFilePath("ignore-in-qds")).exists()) + return true; + + currentDir.cdUp(); + } + + return false; +} + +static bool filterMetaIcons(const QString &fileName) +>>>>>>> CHANGE (1a3998 QmlDesigner: Skip Dependencies folder for resources) { QFileInfo info(fileName); @@ -219,6 +239,10 @@ void FileResourcesModel::refreshModel() QDirIterator it(dirPath.absolutePath(), filterList, QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { const QString absolutePath = it.next(); + + if (checkIgnoreFile(absolutePath)) + continue; + if (filterMetaIcons(absolutePath)) { const QString relativeFilePath = m_docPath.relativeFilePath(absolutePath); m_model.append(