forked from qt-creator/qt-creator
Update mime database from Qt
qtbase/7a4da201b57b12216b556a591100a016e58bab43 QMimeDatabasePrivate: remove duplicate file-opening code Change-Id: Iaa22e7c68f6cba99c404a5d86a44b56b20573ada Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -529,11 +529,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFile(const QString &fileName,
|
|||||||
return mimeTypeForFileExtension(fileName);
|
return mimeTypeForFileExtension(fileName);
|
||||||
case MimeDatabase::MatchContent: {
|
case MimeDatabase::MatchContent: {
|
||||||
QFile file(fileName);
|
QFile file(fileName);
|
||||||
if (file.open(QIODevice::ReadOnly)) {
|
return mimeTypeForData(&file);
|
||||||
return mimeTypeForData(&file);
|
|
||||||
} else {
|
|
||||||
return mimeTypeForName(defaultMimeType());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
Q_ASSERT(false);
|
Q_ASSERT(false);
|
||||||
|
Reference in New Issue
Block a user