From f320426cd1a543f373e61d4c91c6c7e8d35e7247 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Tue, 1 Jan 2013 14:45:37 +0100
Subject: [PATCH] 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: hjk <qthjk@ovi.com>
---
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 2 +-
src/plugins/cmakeprojectmanager/cmakeproject.cpp | 2 +-
src/plugins/cpptools/ModelManagerInterface.h | 2 +-
src/plugins/qt4projectmanager/qt4project.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index e37ad961b24..245ecfb44b6 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -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);
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 3bba513d50b..eda0b031009 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -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();
diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/ModelManagerInterface.h
index 8477b032231..7198a14b0ab 100644
--- a/src/plugins/cpptools/ModelManagerInterface.h
+++ b/src/plugins/cpptools/ModelManagerInterface.h
@@ -73,7 +73,7 @@ public:
{
public:
ProjectPart()
- : language(CXX)
+ : language(CXX11)
, qtVersion(UnknownQt)
{}
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 8dda6976785..9dbcfa469b5 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -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);
--
GitLab