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

QbsProjectManager: Fix compile for old gcc

Browse Source 
Change-Id: Ic2db2bea982c36a26e54033594d39f7a39c6e6f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2019-09-04 06:42:04 +02:00
parent c7e3bbcd11
commit 6ef98541f7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,17 +736,17 @@ static QString getMimeType(const qbs::ArtifactData &sourceFile)
{ {
if (sourceFile.fileTags().contains("hpp")) { if (sourceFile.fileTags().contains("hpp")) {
if (CppTools::ProjectFile::isAmbiguousHeader(sourceFile.filePath())) if (CppTools::ProjectFile::isAmbiguousHeader(sourceFile.filePath()))
return CppTools::Constants::AMBIGUOUS_HEADER_MIMETYPE; return QString(CppTools::Constants::AMBIGUOUS_HEADER_MIMETYPE);
return CppTools::Constants::CPP_HEADER_MIMETYPE; return QString(CppTools::Constants::CPP_HEADER_MIMETYPE);
} }
if (sourceFile.fileTags().contains("cpp")) if (sourceFile.fileTags().contains("cpp"))
return CppTools::Constants::CPP_SOURCE_MIMETYPE; return QString(CppTools::Constants::CPP_SOURCE_MIMETYPE);
if (sourceFile.fileTags().contains("c")) if (sourceFile.fileTags().contains("c"))
return CppTools::Constants::C_SOURCE_MIMETYPE; return QString(CppTools::Constants::C_SOURCE_MIMETYPE);
if (sourceFile.fileTags().contains("objc")) if (sourceFile.fileTags().contains("objc"))
return CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE; return QString(CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE);
if (sourceFile.fileTags().contains("objcpp")) if (sourceFile.fileTags().contains("objcpp"))
return CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE; return QString(CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE);
return {}; return {};
} }