From 7a4da201b57b12216b556a591100a016e58bab43 Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Sat, 11 Dec 2021 18:06:56 +0200 Subject: [PATCH] QMimeDatabasePrivate: remove duplicate file-opening code Don't open the file in mimeTypeForFile(), because mimeTypeForData() opens a closed device in the same ReadOnly mode. mimeTypeForData() also returns mimeTypeForName(defaultMimeType()) when the opening fails. Change-Id: If0b03e2bef3c1b1a2093157e005373adc4e289ed Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimedatabase.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 1e748eee05..5dcdf59453 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -499,11 +499,7 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFile(const QString &fileName, return mimeTypeForFileExtension(fileName); case QMimeDatabase::MatchContent: { QFile file(fileName); - if (file.open(QIODevice::ReadOnly)) { - return mimeTypeForData(&file); - } else { - return mimeTypeForName(defaultMimeType()); - } + return mimeTypeForData(&file); } default: Q_ASSERT(false);