diff --git a/src/corelib/mimetypes/3rdparty/qt_attribution.json b/src/corelib/mimetypes/3rdparty/qt_attribution.json index 7ed6c198b9f..848fff28f1d 100644 --- a/src/corelib/mimetypes/3rdparty/qt_attribution.json +++ b/src/corelib/mimetypes/3rdparty/qt_attribution.json @@ -16,11 +16,11 @@ "The Apache Tika MimeTypes list many known MIME types and how to match files (using globs and/or 'magic' rules for the file contents)", "Homepage": "https://github.com/apache/tika/tree/main/tika-core/src/main/resources/org/apache/tika/mime", - "Version": "019041117149667bc4d18fabf222a0670d407959", + "Version": "5ea8bbf1644a593ed22ee5c7608ba33aff949d5d", "DownloadLocation": - "https://github.com/apache/tika/blob/019041117149667bc4d18fabf222a0670d407959/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml", + "https://github.com/apache/tika/blob/5ea8bbf1644a593ed22ee5c7608ba33aff949d5d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml", "License": "Apache License 2.0", "LicenseId": "Apache-2.0", - "Copyright": "Copyright 2011 The Apache Software Foundation" + "Copyright": "Copyright 2024 The Apache Software Foundation" } ] diff --git a/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml b/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml index 739877cc4eb..dc06f270be9 100644 --- a/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml +++ b/src/corelib/mimetypes/3rdparty/tika-mimetypes.xml @@ -4957,6 +4957,15 @@ + + Java Keystore + https://en.wikipedia.org/wiki/Java_KeyStore + + + + + + @@ -5534,6 +5543,7 @@ + diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 472d2ecf691..5d42e46c323 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -800,7 +800,7 @@ void tst_QMimeDatabase::allMimeTypes() if (m_hasFreedesktopOrg) QCOMPARE(lst.size(), 908); else - QCOMPARE(lst.size(), 1640); // interestingly, tika has more mimetypes (but many are empty) + QCOMPARE(lst.size(), 1641); // interestingly, tika has more mimetypes (but many are empty) for (const QMimeType &mime : lst) { const QString name = mime.name();