From 3922db8ca93610463f17cea425a36330622348ae Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 25 Feb 2022 10:10:04 +0100
Subject: [PATCH] Mimetypes v3: Reimplement MimeType matchesName

This makes Qt Creator set the right default editor again.
Visible in the MIME Types setting, before this change everything is
opened in the text editor.

Change-Id: I88ffc2e41688c2395925821e1d5d8ffee0d127eb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimetype.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimetype.cpp b/src/libs/utils/mimetypes2/mimetype.cpp
index cfc824c9590..b5c59394474 100644
--- a/src/libs/utils/mimetypes2/mimetype.cpp
+++ b/src/libs/utils/mimetypes2/mimetype.cpp
@@ -521,10 +521,11 @@ bool MimeType::inherits(const QString &mimeTypeName) const
 */
 bool MimeType::matchesName(const QString &nameOrAlias) const
 {
-//    if (d->name == nameOrAlias)
-//        return true;
-//    return MimeDatabasePrivate::instance()->provider()->resolveAlias(nameOrAlias) == d->name;
-    return true;
+    if (d->name == nameOrAlias)
+        return true;
+    auto dbp = MimeDatabasePrivate::instance();
+    QMutexLocker locker(&dbp->mutex);
+    return MimeDatabasePrivate::instance()->resolveAlias(nameOrAlias) == d->name;
 }
 
 /*!