whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <thiago.macieira@intel.com>
bb10
Igor Kushnir 2021-12-11 18:06:56 +02:00
parent 9eca0def34
commit 7a4da201b5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/mimetypes/qmimedatabase.cpp
View File

@ -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);