From 2b7de16fbe399daa00986f2d32d05cfe51966b66 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 28 Jan 2018 10:53:02 +0100 Subject: [PATCH] QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream This leads to an automatically appended .bin when saving a file. https://bugs.freedesktop.org/show_bug.cgi?id=101667 https://bugs.kde.org/382437 Fixed upstream in shared-mime-info 1.10 Change-Id: I125a0bc72c91a082706bf2bf149adcf63ff1ec6b Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimetype.cpp | 2 ++ .../auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 8f6237c1cb..d7590ecf1f 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -466,6 +466,8 @@ QStringList QMimeType::suffixes() const */ QString QMimeType::preferredSuffix() const { + if (isDefault()) // workaround for unwanted *.bin suffix for octet-stream, https://bugs.freedesktop.org/show_bug.cgi?id=101667, fixed upstream in 1.10 + return QString(); const QStringList suffixList = suffixes(); return suffixList.isEmpty() ? QString() : suffixList.at(0); } diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index b1a49b7d98..e3504de732 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -635,6 +635,7 @@ void tst_QMimeDatabase::suffixes_data() QTest::newRow("mimetype with multiple patterns") << "text/plain" << "*.asc;*.txt;*,v" << "txt"; QTest::newRow("mimetype with uncommon pattern") << "text/x-readme" << "README*" << QString(); QTest::newRow("mimetype with no patterns") << "application/x-ole-storage" << QString() << QString(); + QTest::newRow("default_mimetype") << "application/octet-stream" << "*.bin" << QString(); } void tst_QMimeDatabase::suffixes()