From eeac3b48510a0e9b271e801a9546c637561f5691 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Tue, 3 Sep 2024 15:12:30 +0200
Subject: [PATCH] QbsProjectManager: Try harder to categorize header files
 correctly

Change-Id: I89809ec926512285c57ce38fc3105758cc5c2d85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index e9e2f29e307..2f6bf2cba23 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -44,8 +44,9 @@
 #include <utils/async.h>
 #include <utils/environment.h>
 #include <utils/fileutils.h>
-#include <utils/mimeconstants.h>
 #include <utils/hostosinfo.h>
+#include <utils/mimeconstants.h>
+#include <utils/mimeutils.h>
 #include <utils/qtcassert.h>
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
@@ -653,8 +654,9 @@ static QString getMimeType(const QJsonObject &sourceArtifact)
     using namespace Utils::Constants;
     const auto tags = sourceArtifact.value("file-tags").toArray();
     if (tags.contains("hpp")) {
-        if (CppEditor::ProjectFile::isAmbiguousHeader(sourceArtifact.value("file-path").toString()))
-            return QString(AMBIGUOUS_HEADER_MIMETYPE);
+        const QString filePath = sourceArtifact.value("file-path").toString();
+        if (CppEditor::ProjectFile::isAmbiguousHeader(filePath))
+            return Utils::mimeTypeForFile(filePath).name();
         return QString(CPP_HEADER_MIMETYPE);
     }
     if (tags.contains("cpp"))