diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-09 17:04:20 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-03-10 12:17:32 +0000 |
commit | 416438c2f35dc774e4c52a705c5a7098a69647fc (patch) | |
tree | 86686f993611a9e5dad7eff4993f0746918b431d | |
parent | ed0c0070f9b05c647019270dfc42073d071c830a (diff) |
QMimeDatabase: Fix magic rules with \t
\t was not interpreted as a tab character.
Task-number: QTBUG-44884
Change-Id: I3c733e227fba7e5fd5153df0ae4d0431903bb104
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrule.cpp | 2 | ||||
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index e83a38d82f..e81a0d62a0 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -215,6 +215,8 @@ static inline QByteArray makePattern(const QByteArray &value) *data++ = '\n'; } else if (*p == 'r') { *data++ = '\r'; + } else if (*p == 't') { + *data++ = '\t'; } else { // escaped *data++ = *p; } diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 1513a75148..b449a78200 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -460,6 +460,7 @@ void tst_QMimeDatabase::mimeTypeForData_data() QTest::newRow("tnef data, needs smi >= 0.20") << QByteArray("\x78\x9f\x3e\x22") << "application/vnd.ms-tnef"; QTest::newRow("PDF magic") << QByteArray("%PDF-") << "application/pdf"; QTest::newRow("PHP, High-priority rule") << QByteArray("<?php") << "application/x-php"; + QTest::newRow("diff\\t") << QByteArray("diff\t") << "text/x-patch"; QTest::newRow("unknown") << QByteArray("\001abc?}") << "application/octet-stream"; } |