feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Try harder to categorize header files correctly

Browse Source 
Change-Id: I89809ec926512285c57ce38fc3105758cc5c2d85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-09-03 15:12:30 +02:00
parent 7bc7006552
commit eeac3b4851
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

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