From 8f009ca2af168690e95b9c1cf2ecafc6c2f68b32 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 8 Aug 2024 16:16:53 +0200 Subject: [PATCH] Update mime database from Qt qtbase/7a4da201b57b12216b556a591100a016e58bab43 QMimeDatabasePrivate: remove duplicate file-opening code Change-Id: Iaa22e7c68f6cba99c404a5d86a44b56b20573ada Reviewed-by: Jarek Kobus --- src/libs/utils/mimetypes2/mimedatabase.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index 961f026b674..d5e6a152d29 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -529,11 +529,7 @@ MimeType MimeDatabasePrivate::mimeTypeForFile(const QString &fileName, return mimeTypeForFileExtension(fileName); case MimeDatabase::MatchContent: { QFile file(fileName); - if (file.open(QIODevice::ReadOnly)) { - return mimeTypeForData(&file); - } else { - return mimeTypeForName(defaultMimeType()); - } + return mimeTypeForData(&file); } default: Q_ASSERT(false);