From 30b37a989ab351f3a8b52c659ea51fa149471342 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Tue, 22 Oct 2019 17:12:20 +0300
Subject: [PATCH] Ignore asset file suffix case when importing 3D assets

Change-Id: Ic742f5c6bec82718d99d472a26271cf500594e63
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/itemlibrary/itemlibraryassetimportdialog.cpp     | 2 +-
 .../components/itemlibrary/itemlibraryassetimporter.cpp         | 2 +-
 .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index d7f84fddd10..3f403d03133 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -165,7 +165,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(const QStringList &im
         QMap<QString, int> tabMap; // QMap used for alphabetical order
         for (const auto &file : qAsConst(m_quick3DFiles)) {
             auto extIt = supportedExtensions.constBegin();
-            QString ext = QFileInfo(file).suffix();
+            QString ext = QFileInfo(file).suffix().toLower();
             while (extIt != supportedExtensions.constEnd()) {
                 if (!tabMap.contains(extIt.key()) && extIt.value().contains(ext)) {
                     tabMap.insert(extIt.key(), m_extToImportOptionsMap.value(ext));
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index ac40e87c791..d4f1d090baf 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -173,7 +173,7 @@ bool ItemLibraryAssetImporter::isQuick3DAsset(const QString &fileName) const
         for (const auto &ext : exts)
             quick3DExt << ext;
     }
-    return quick3DExt.contains(QFileInfo(fileName).suffix());
+    return quick3DExt.contains(QFileInfo(fileName).suffix().toLower());
 #else
     Q_UNUSED(fileName)
     return false;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 8010ed61075..a24cfc731e2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -517,7 +517,7 @@ void ItemLibraryWidget::addResources()
     QMultiMap<QString, QString> partitionedFileNames;
 
     for (const QString &fileName : fileNames) {
-        const QString suffix = "*." + QFileInfo(fileName).suffix();
+        const QString suffix = "*." + QFileInfo(fileName).suffix().toLower();
         const QString category = reverseMap.value(suffix);
         partitionedFileNames.insert(category, fileName);
     }