diff options
| author | David Faure <david.faure@kdab.com> | 2015-08-25 14:30:07 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2015-09-04 20:00:22 +0000 |
| commit | 5e41f4137dd42a9a639be8743ae95c8e159bd4e0 (patch) | |
| tree | 458a432ed04ddd9556a97358c2bbf9212fecbf57 /src/corelib/mimetypes/qmimemagicrule_p.h | |
| parent | 880a8aa7e99bb91e7a815cadde72bb5230c815ea (diff) | |
QMimeDatabase: warn instead of asserting on bad magic.
An invalid mime magic definition could lead to an assert. Replaced with
a qWarning. Move all checking to the QMimeMagicRule constructor, and do
keep invalid rules since they are need to parse child rules.
Unit test added, with QTest::ignoreMessage when using the XML backend
(there's no warning from update-mime-database when using the cache).
Also make it easier to add more shared mime info files for tests.
Task-number: QTBUG-44319
Done-with: Eike Ziller <eike.ziller@theqtcompany.com>
Change-Id: Ie39a160a106b650cdcee88778fa7eff9e932a988
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/mimetypes/qmimemagicrule_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimemagicrule_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index 03ac1d1de9..6b64bfcc10 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -61,7 +61,8 @@ class QMimeMagicRule public: enum Type { Invalid = 0, String, Host16, Host32, Big16, Big32, Little16, Little32, Byte }; - QMimeMagicRule(Type type, const QByteArray &value, int startPos, int endPos, const QByteArray &mask = QByteArray()); + QMimeMagicRule(const QString &typeStr, const QByteArray &value, const QString &offsets, + const QByteArray &mask, QString *errorString); QMimeMagicRule(const QMimeMagicRule &other); ~QMimeMagicRule(); |