From 09716d64b3d12dde440504cac4972a172425ff15 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 18 Feb 2015 14:36:34 +0100 Subject: [PATCH] MimeData: Never detect anything as application/x-zerosize - That mime type is pretty useless - If there are two mime types that match a file by glob pattern, the mime database implementation will find the best matching mime type by data of *all* mime types and take that instead (this doesn't make sense btw). That means that if .h is matched by c-hdr and c++-hdr, empty .h files are detected as mime type application/x-zerosize, which is pretty useless Change-Id: I4f9d532ef1efd29df00279c693486c92611485a8 Reviewed-by: Nikolai Kosjar Reviewed-by: Christian Kandeler Reviewed-by: Daniel Teske --- src/libs/utils/mimetypes/mimedatabase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp index 32629a74edb..47146553512 100644 --- a/src/libs/utils/mimetypes/mimedatabase.cpp +++ b/src/libs/utils/mimetypes/mimedatabase.cpp @@ -135,10 +135,10 @@ static inline bool isTextFile(const QByteArray &data) MimeType MimeDatabasePrivate::findByData(const QByteArray &data, int *accuracyPtr) { - if (data.isEmpty()) { - *accuracyPtr = 100; - return mimeTypeForName(QLatin1String("application/x-zerosize")); - } +// if (data.isEmpty()) { +// *accuracyPtr = 100; +// return mimeTypeForName(QLatin1String("application/x-zerosize")); +// } *accuracyPtr = 0; MimeType candidate = provider()->findByMagic(data, accuracyPtr);