diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2018-10-12 11:11:37 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2018-11-13 11:16:17 +0000 |
| commit | e8e8fb5154697132b930ff7a9005eef312511e71 (patch) | |
| tree | ebaa24ae20a6ed2a2aa29b39f9064e362ce0fda0 /src/corelib/mimetypes/qmimedatabase.cpp | |
| parent | 2569a5136e72214f45f4e34f8fa2fdf5ab0dbf83 (diff) | |
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 <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |