/tests/qmldynamicdata/

cgit/qt/qtbase.git/'>qt/qtbase.git
Qt Base (Core, Gui, Widgets, Network, ...)
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2022-05-05 11:31:37 +0200
committerLiang Qi <liang.qi@qt.io>2022-05-11 11:36:49 +0200
commit4872392925b5d4df3e307b71a9a575b7d26e4c7e (patch)
tree70e5d3e5d1196a3200188627c26cf578b04e7166
parent7f72622c0f53a18b8e4215fc8428dc01894db938 (diff)
Update shared-mime-info to the 2.2 release
This also includes the fix for x-objc++src mimetype. Fixes: QTBUG-70739 Pick-to: 6.3 6.2 5.15 Change-Id: I24f70fa5cea2e5b1a7877569be98d36878fcfe72 Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat
-rw-r--r--src/corelib/mimetypes/mime/packages/freedesktop.org.xml70987
-rw-r--r--tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp10
2 files changed, 35855 insertions, 35142 deletions
diff --git a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml
index e73929c9bb..c91170b523 100644
--- a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml
+++ b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml