feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update mime database from Qt

Browse Source 
qtbase/6ad6df88dc1067d7dd38e40ceae8840fc03af4cd
  QMimeDatabasePrivate: remove Release-only fallback

Change-Id: Ic64929b0db436213e84c5f92d94732c8e0489201
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-09 10:23:19 +02:00
parent 5fb783969e
commit 2bb76fe034
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/mimetypes2/mimedatabase.cpp
View File

@@ -518,17 +518,16 @@ MimeType MimeDatabasePrivate::mimeTypeForFile(const QString &fileName,
switch (mode) { switch (mode) {
case MimeDatabase::MatchDefault: case MimeDatabase::MatchDefault:
return mimeTypeForFileNameAndData(fileName, nullptr); break;
case MimeDatabase::MatchExtension: case MimeDatabase::MatchExtension:
return mimeTypeForFileExtension(fileName); return mimeTypeForFileExtension(fileName);
case MimeDatabase::MatchContent: { case MimeDatabase::MatchContent: {
QFile file(fileName); QFile file(fileName);
return mimeTypeForData(&file); return mimeTypeForData(&file);
} }
default:
Q_ASSERT(false);
} }
return mimeTypeForName(defaultMimeType()); // MatchDefault:
return mimeTypeForFileNameAndData(fileName, nullptr);
} }
QList<MimeType> MimeDatabasePrivate::allMimeTypes() QList<MimeType> MimeDatabasePrivate::allMimeTypes()