feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ignore asset file suffix case when importing 3D assets

Browse Source 
Change-Id: Ic742f5c6bec82718d99d472a26271cf500594e63
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2019-10-22 17:12:20 +03:00
parent 4eb51a66ac
commit 30b37a989a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
View File

@@ -165,7 +165,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(const QStringList &im
QMap<QString, int> tabMap; // QMap used for alphabetical order QMap<QString, int> tabMap; // QMap used for alphabetical order
for (const auto &file : qAsConst(m_quick3DFiles)) { for (const auto &file : qAsConst(m_quick3DFiles)) {
auto extIt = supportedExtensions.constBegin(); auto extIt = supportedExtensions.constBegin();
QString ext = QFileInfo(file).suffix(); QString ext = QFileInfo(file).suffix().toLower();
while (extIt != supportedExtensions.constEnd()) { while (extIt != supportedExtensions.constEnd()) {
if (!tabMap.contains(extIt.key()) && extIt.value().contains(ext)) { if (!tabMap.contains(extIt.key()) && extIt.value().contains(ext)) {
tabMap.insert(extIt.key(), m_extToImportOptionsMap.value(ext)); tabMap.insert(extIt.key(), m_extToImportOptionsMap.value(ext));

2
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
View File

@@ -173,7 +173,7 @@ bool ItemLibraryAssetImporter::isQuick3DAsset(const QString &fileName) const
for (const auto &ext : exts) for (const auto &ext : exts)
quick3DExt << ext; quick3DExt << ext;
} }
return quick3DExt.contains(QFileInfo(fileName).suffix()); return quick3DExt.contains(QFileInfo(fileName).suffix().toLower());
#else #else
Q_UNUSED(fileName) Q_UNUSED(fileName)
return false; return false;

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -517,7 +517,7 @@ void ItemLibraryWidget::addResources()
QMultiMap<QString, QString> partitionedFileNames; QMultiMap<QString, QString> partitionedFileNames;
for (const QString &fileName : fileNames) { for (const QString &fileName : fileNames) {
const QString suffix = "*." + QFileInfo(fileName).suffix(); const QString suffix = "*." + QFileInfo(fileName).suffix().toLower();
const QString category = reverseMap.value(suffix); const QString category = reverseMap.value(suffix);
partitionedFileNames.insert(category, fileName); partitionedFileNames.insert(category, fileName);
} }