summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2016-12-05 15:38:38 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2016-12-13 08:33:09 +0000
commita10bfb8400911abef2928d4494a75ab22fdf8c99 (patch)
tree1a81def90a11f4dc40a519c5083c19c5094b0420 /src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
parent602ad72d42797b9d40c31f52d5937319a0d852d9 (diff)
downloadqt-creator-a10bfb8400911abef2928d4494a75ab22fdf8c99.tar.gz
CppTools: Do not hardcode default language version
...instead, use the latest we support. Change-Id: I7e7768bc4bc31de1fe0f441c03f3ab5d677d76e8 Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppbaseprojectpartbuilder.cpp')
-rw-r--r--src/plugins/cpptools/cppbaseprojectpartbuilder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
index 021b12b4c2..06d7c678d5 100644
--- a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
+++ b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
@@ -130,28 +130,28 @@ QList<Core::Id> BaseProjectPartBuilder::createProjectPartsForFiles(const QString
if (cat.hasCSources()) {
createProjectPart(cat.cSources(),
cat.partName("C"),
- ProjectPart::C11,
+ ProjectPart::LatestCVersion,
ProjectPart::NoExtensions);
}
if (cat.hasObjcSources()) {
createProjectPart(cat.objcSources(),
cat.partName("Obj-C"),
- ProjectPart::C11,
+ ProjectPart::LatestCVersion,
ProjectPart::ObjectiveCExtensions);
}
if (cat.hasCxxSources()) {
createProjectPart(cat.cxxSources(),
cat.partName("C++"),
- ProjectPart::CXX11,
+ ProjectPart::LatestCxxVersion,
ProjectPart::NoExtensions);
}
if (cat.hasObjcxxSources()) {
createProjectPart(cat.objcxxSources(),
cat.partName("Obj-C++"),
- ProjectPart::CXX11,
+ ProjectPart::LatestCxxVersion,
ProjectPart::ObjectiveCExtensions);
}
}
@@ -295,7 +295,7 @@ ToolChainInterfacePtr BaseProjectPartBuilder::selectToolChain(
{
ToolChainInterfacePtr toolChain = nullptr;
- if (languageVersion < ProjectPart::CXX98)
+ if (languageVersion <= ProjectPart::LatestCVersion)
toolChain = m_project->toolChain(ProjectExplorer::ToolChain::Language::C, m_cFlags);
if (!toolChain) // Use Cxx toolchain for C projects without C compiler in kit and for C++ code