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

Update mime database from Qt

Browse Source 
qtbase/49b726fa71418c2d7efdfec91e287f4aaac9cd9b
  QMimeDatabasePrivate: remove duplicate else-if branch

Change-Id: Idff4f0162dced6f2ceb0f7396287279f67adbd04
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-08 16:10:55 +02:00
parent 587cf11530
commit 86dcac6d62
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/mimetypes2/mimedatabase.cpp
View File

@@ -471,13 +471,10 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
MimeType MimeDatabasePrivate::mimeTypeForFileExtension(const QString &fileName) MimeType MimeDatabasePrivate::mimeTypeForFileExtension(const QString &fileName)
{ {
const QStringList matches = mimeTypeForFileName(fileName); const QStringList matches = mimeTypeForFileName(fileName);
const int matchCount = matches.count(); if (matches.isEmpty()) {
if (matchCount == 0) {
return mimeTypeForName(defaultMimeType()); return mimeTypeForName(defaultMimeType());
} else if (matchCount == 1) {
return mimeTypeForName(matches.first());
} else { } else {
// We have to pick one. // We have to pick one in case of multiple matches.
return mimeTypeForName(matches.first()); return mimeTypeForName(matches.first());
} }
} }