From e8e8fb5154697132b930ff7a9005eef312511e71 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 12 Oct 2018 11:11:37 +0200 Subject: QMimeDatabasePrivate: Match shared-mime-info behavior better * Take into account alias when resolving inheritance FAIL! : tst_QMimeDatabase::findByFile(sqlite3.kexi) Compared values are not the same Actual (resultMimeTypeName.toLower()): "application/vnd.sqlite3" Expected (mimeTypeName.toLower()) : "application/x-kexiproject-sqlite3" Loc: [/home/tsdgeos/qt/qtbase_dev/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/../tst_qmimedatabase.cpp(841)] Change-Id: Ie5b095669979efef0b1de4175723190ea1f4d5a0 Reviewed-by: David Faure --- src/corelib/mimetypes/qmimedatabase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/mimetypes/qmimedatabase.cpp') diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 50b30a1832..24a7a35ea5 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -422,7 +422,7 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent) toCheck.pop(); const auto parentList = parents(mimeName); for (const QString &par : parentList) - toCheck.push(par); + toCheck.push(resolveAlias(par)); } return false; } -- cgit v1.2.3