forked from qt-creator/qt-creator
Update mime database from Qt
qtbase/49b726fa71418c2d7efdfec91e287f4aaac9cd9b QMimeDatabasePrivate: remove duplicate else-if branch Change-Id: Idff4f0162dced6f2ceb0f7396287279f67adbd04 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -471,13 +471,10 @@ MimeType MimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName
|
||||
MimeType MimeDatabasePrivate::mimeTypeForFileExtension(const QString &fileName)
|
||||
{
|
||||
const QStringList matches = mimeTypeForFileName(fileName);
|
||||
const int matchCount = matches.count();
|
||||
if (matchCount == 0) {
|
||||
if (matches.isEmpty()) {
|
||||
return mimeTypeForName(defaultMimeType());
|
||||
} else if (matchCount == 1) {
|
||||
return mimeTypeForName(matches.first());
|
||||
} else {
|
||||
// We have to pick one.
|
||||
// We have to pick one in case of multiple matches.
|
||||
return mimeTypeForName(matches.first());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user