diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:46 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-11 22:22:47 +0200 |
commit | 8ed2fcd366caf310e99db982f222bc6ec750c0a7 (patch) | |
tree | c51cae57da4a87d677145e44ba57765a1e5a3874 /tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc | |
parent | 6918c0a15ba049d7e0de2302846dfadce4866861 (diff) | |
parent | c12b5e07274acde364be98cd0de620d3a44c97b7 (diff) |
Merge 5.5 into 5.5.1
Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
Diffstat (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc b/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc index 4654a61660..29666627a1 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc +++ b/tests/auto/corelib/mimetypes/qmimedatabase/testdata.qrc @@ -4,5 +4,8 @@ <file alias="qml-again.xml">qml-again.xml</file> <file alias="text-x-objcsrc.xml">text-x-objcsrc.xml</file> <file alias="test.qml">test.qml</file> + <file>invalid-magic1.xml</file> + <file>invalid-magic2.xml</file> + <file>invalid-magic3.xml</file> </qresource> </RCC> |