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

Fix Utils::LanguageVersion::None handling

Browse Source 
Change-Id: Id0d8bd59c1a317103ea309ee2f9b982ecfd6d6c7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2019-04-03 18:11:15 +02:00
parent d1fd3ea667
commit a78655e521
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppcheck/cppchecktool.cpp
View File

@@ -165,6 +165,8 @@ QStringList CppcheckTool::additionalArguments(const CppTools::ProjectPart &part)
case Version::CXX2a: case Version::CXX2a:
result.push_back("--language=c++"); result.push_back("--language=c++");
break; break;
case Version::None:
break;
} }
using QtVersion = CppTools::ProjectPart::QtVersion; using QtVersion = CppTools::ProjectPart::QtVersion;

23
src/plugins/cpptools/cppcodemodelinspectordumper.cpp
View File

@@ -107,17 +107,18 @@ QString Utils::toString(::Utils::LanguageVersion languageVersion)
{ {
#define CASE_LANGUAGEVERSION(x) case ::Utils::LanguageVersion::x: return QLatin1String(#x) #define CASE_LANGUAGEVERSION(x) case ::Utils::LanguageVersion::x: return QLatin1String(#x)
switch (languageVersion) { switch (languageVersion) {
CASE_LANGUAGEVERSION(C89); CASE_LANGUAGEVERSION(None);
CASE_LANGUAGEVERSION(C99); CASE_LANGUAGEVERSION(C89);
CASE_LANGUAGEVERSION(C11); CASE_LANGUAGEVERSION(C99);
CASE_LANGUAGEVERSION(C18); CASE_LANGUAGEVERSION(C11);
CASE_LANGUAGEVERSION(CXX98); CASE_LANGUAGEVERSION(C18);
CASE_LANGUAGEVERSION(CXX03); CASE_LANGUAGEVERSION(CXX98);
CASE_LANGUAGEVERSION(CXX11); CASE_LANGUAGEVERSION(CXX03);
CASE_LANGUAGEVERSION(CXX14); CASE_LANGUAGEVERSION(CXX11);
CASE_LANGUAGEVERSION(CXX17); CASE_LANGUAGEVERSION(CXX14);
CASE_LANGUAGEVERSION(CXX2a); CASE_LANGUAGEVERSION(CXX17);
// no default to get a compiler warning if anything is added CASE_LANGUAGEVERSION(CXX2a);
// no default to get a compiler warning if anything is added
} }
#undef CASE_LANGUAGEVERSION #undef CASE_LANGUAGEVERSION
return QString(); return QString();