1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update shared-mime-info to the 2.2 release

Browse Source 
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>
This commit is contained in:
Liang Qi 2022-05-05 11:31:37 +02:00
parent 7f72622c0f
commit 4872392925
2 changed files with 35855 additions and 35142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70987
src/corelib/mimetypes/mime/packages/freedesktop.org.xml
View File

File diff suppressed because it is too large Load Diff

10
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -78,12 +78,12 @@ static inline QString testSuiteWarning()
str << "\nCannot find the shared-mime-info test suite\nin the parent of: "
<< QDir::toNativeSeparators(QDir::currentPath()) << "\n"
"cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n"
"wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.1/shared-mime-info-2.1.zip\n"
"unzip shared-mime-info-2.1.zip\n";
"wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.2/shared-mime-info-2.2.zip\n"
"unzip shared-mime-info-2.2.zip\n";
#ifdef Q_OS_WIN
str << "mkdir testfiles\nxcopy /s shared-mime-info-2.1 s-m-i\n";
str << "mkdir testfiles\nxcopy /s shared-mime-info-2.2 s-m-i\n";
#else
str << "ln -s shared-mime-info-2.1 s-m-i\n";
str << "ln -s shared-mime-info-2.2 s-m-i\n";
#endif
return result;
}
@ -616,7 +616,7 @@ void tst_QMimeDatabase::allMimeTypes()
QVERIFY(!lst.isEmpty());
// Hardcoding this is the only way to check both providers find the same number of mimetypes.
QCOMPARE(lst.count(), 811);
QCOMPARE(lst.count(), 851);
foreach (const QMimeType &mime, lst) {
const QString name = mime.name();