From 9308549396b0965d80c4fee6b65e1f9482b62a3c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Mon, 17 Jun 2024 16:34:14 +0300
Subject: [PATCH] QmlDesigner: Sort import list when importing multiple 3D
 assets

Fixes: QDS-13032
Change-Id: I616cb4dce95565f965cd61cce70fe22640930554
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 .../itemlibrary/itemlibraryassetimportdialog.ui      |  2 +-
 .../itemlibrary/itemlibraryassetimporter.cpp         | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.ui b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.ui
index 26ea77f172b..a1b51881d72 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.ui
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.ui
@@ -44,7 +44,7 @@
         </size>
        </property>
        <property name="sortingEnabled">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index 9e0d559d53f..55e5c19e7e9 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -666,7 +666,17 @@ void ItemLibraryAssetImporter::postImport()
             data.optionsIndex = pd.optionsIndex;
             data.type = pd.sourceInfo.suffix().toLower();
             data.size = pd.assetSize;
-            dataList.append(data);
+
+            bool inserted = false;
+            for (int i = 0; i < dataList.size(); ++i) {
+                if (dataList[i].name.compare(data.name, Qt::CaseInsensitive) > 0) {
+                    dataList.insert(i, data);
+                    inserted = true;
+                    break;
+                }
+            }
+            if (!inserted)
+                dataList.append(data);
         }
 
         emit importReadyForPreview(m_tempDir->path(), dataList);