From 2e652405cd61025fa228cfe0dcba7c9b7cc1a5b5 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Wed, 18 Aug 2021 00:25:48 +0300
Subject: [PATCH] QmlDesigner: Allow all asset folders except for import
 folders

...so that assets from imported bridge content appear in the assets
library.

Fixes: QDS-4842
Change-Id: I8f8e685ffd6e02e885eccfc0b29f2d81f989984a
Reviewed-by: Miina Puuronen <miina.puuronen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/itemlibrary/itemlibraryassetsmodel.cpp         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
index 1e4fef44d21..f0bfeab9294 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
@@ -226,7 +226,7 @@ void ItemLibraryAssetsModel::refresh()
 
 void ItemLibraryAssetsModel::setRootPath(const QString &path)
 {
-    static const QStringList supportedTopLevelDirs {"images", "sounds", "fonts", "assets", "shaders"};
+    static const QStringList ignoredTopLevelDirs {"imports", "asset_imports"};
 
     m_fileSystemWatcher->removeDirectories(m_fileSystemWatcher->directories());
     m_fileSystemWatcher->removeFiles(m_fileSystemWatcher->files());
@@ -256,7 +256,7 @@ void ItemLibraryAssetsModel::setRootPath(const QString &path)
 
         while (itDirs.hasNext()) {
             QDir subDir = itDirs.next();
-            if (currDepth == 1 && !supportedTopLevelDirs.contains(subDir.dirName()))
+            if (currDepth == 1 && ignoredTopLevelDirs.contains(subDir.dirName()))
                 continue;
 
             ItemLibraryAssetsDir *assetsDir = new ItemLibraryAssetsDir(subDir.path(), currDepth, loadExpandedState(subDir.path()), currAssetsDir);