forked from qt-creator/qt-creator
Update mime database from Qt
qtbase/6ad6df88dc1067d7dd38e40ceae8840fc03af4cd QMimeDatabasePrivate: remove Release-only fallback Change-Id: Ic64929b0db436213e84c5f92d94732c8e0489201 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -518,17 +518,16 @@ MimeType MimeDatabasePrivate::mimeTypeForFile(const QString &fileName,
|
||||
|
||||
switch (mode) {
|
||||
case MimeDatabase::MatchDefault:
|
||||
return mimeTypeForFileNameAndData(fileName, nullptr);
|
||||
break;
|
||||
case MimeDatabase::MatchExtension:
|
||||
return mimeTypeForFileExtension(fileName);
|
||||
case MimeDatabase::MatchContent: {
|
||||
QFile file(fileName);
|
||||
return mimeTypeForData(&file);
|
||||
}
|
||||
default:
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
return mimeTypeForName(defaultMimeType());
|
||||
// MatchDefault:
|
||||
return mimeTypeForFileNameAndData(fileName, nullptr);
|
||||
}
|
||||
|
||||
QList<MimeType> MimeDatabasePrivate::allMimeTypes()
|
||||
|
Reference in New Issue
Block a user