diff options
| author | David Faure <faure@kde.org> | 2012-10-22 12:42:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-14 14:18:31 +0100 |
| commit | 7721c3d27c6ad98f27de5ecd008d32b2efb25d59 (patch) | |
| tree | 3abbc17a31c43bc7e0a789a1a285233accfb6bef /tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h | |
| parent | 9346cb955230b3fbca8062a2fe8c912713011ce4 (diff) | |
QMimeDatabase: Fix handling of duplicate mimetype definitions.
When both freedesktop.org.xml and kde.xml define text/x-qml (*.qml),
the XML provider would look up *.qml, see two mimetypes, and treat that
as a glob conflict, and proceed with contents-based-determination,
which for this sample file, would find "C source" due to the C comment.
Fixed by ignoring duplicate pattern-mimetype associations.
The binary-cache provider doesn't have this problem, update-mime-database
already filters out duplicates when generating the on-disk extension tree.
Change-Id: Ie335b0b419e7413fa0550779709513f68c2bfc68
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h')
| -rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h index ea050b5014..6db09e2078 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.h @@ -97,6 +97,7 @@ private: QString m_globalXdgDir; QString m_localXdgDir; QString m_yastMimeTypes; + QString m_qmlAgainFileName; QTemporaryDir m_temporaryDir; QString m_testSuite; }; |