From 2bb76fe0345cf4cbeab7292bbb615041827536c4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 9 Aug 2024 10:23:19 +0200 Subject: [PATCH] Update mime database from Qt qtbase/6ad6df88dc1067d7dd38e40ceae8840fc03af4cd QMimeDatabasePrivate: remove Release-only fallback Change-Id: Ic64929b0db436213e84c5f92d94732c8e0489201 Reviewed-by: Jarek Kobus --- src/libs/utils/mimetypes2/mimedatabase.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index 19d0fafa7ce..3b1978c6d32 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -518,17 +518,16 @@ MimeType MimeDatabasePrivate::mimeTypeForFile(const QString &fileName, switch (mode) { case MimeDatabase::MatchDefault: - return mimeTypeForFileNameAndData(fileName, nullptr); + break; case MimeDatabase::MatchExtension: return mimeTypeForFileExtension(fileName); case MimeDatabase::MatchContent: { QFile file(fileName); return mimeTypeForData(&file); } - default: - Q_ASSERT(false); } - return mimeTypeForName(defaultMimeType()); + // MatchDefault: + return mimeTypeForFileNameAndData(fileName, nullptr); } QList MimeDatabasePrivate::allMimeTypes()