Commit f320426c authored by Daniel Teske's avatar Daniel Teske Committed by hjk
Browse files

Use C++11 parsing mode for CMake, AutoTools and Generic project managers



Those 3 project managers can't easily figure out the right mode for code
parsing. The code we are parsing is predominantly C++98 code. But for
those using C++98 toolchains having valid C++11 code not be marked as a
error is probably not much of a problem, whereas the reverse, using a
C++11 toolchain and having valid code being marked as a error is
annoying.

Change-Id: I8dcc172029045cf591b3ba0adef1585f3f94fd39
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 577fe8a4
......@@ -441,7 +441,7 @@ void AutotoolsProject::updateCppCodeModel()
part->sourceFiles = m_files;
part->defines = macros;
part->frameworkPaths = allFrameworkPaths;
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX;
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX11;
pinfo.appendProjectPart(part);
modelManager->updateProjectInfo(pinfo);
......
......@@ -339,7 +339,7 @@ bool CMakeProject::parseCMakeLists()
part->sourceFiles = m_files;
part->defines = allDefines;
part->frameworkPaths = allFrameworkPaths;
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX;
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX11;
pinfo.appendProjectPart(part);
modelmanager->updateProjectInfo(pinfo);
m_codeModelFuture.cancel();
......
......@@ -73,7 +73,7 @@ public:
{
public:
ProjectPart()
: language(CXX)
: language(CXX11)
, qtVersion(UnknownQt)
{}
......
......@@ -633,7 +633,7 @@ void Qt4Project::updateCppCodeModel()
if (tc)
part->language = tc->compilerFlags(pro->variableValue(CppFlagsVar)) == ToolChain::STD_CXX11 ? ProjectPart::CXX11 : ProjectPart::CXX;
else
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX;
part->language = CPlusPlus::CppModelManagerInterface::ProjectPart::CXX11;
part->sourceFiles = pro->variableValue(CppSourceVar);
part->headerFiles += pro->variableValue(CppHeaderVar);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment