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

CppTools: Do not hardcode default language version

Browse Source 
...instead, use the latest we support.

Change-Id: I7e7768bc4bc31de1fe0f441c03f3ab5d677d76e8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-12-05 15:38:38 +01:00
parent 602ad72d42
commit a10bfb8400
8 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/unittest/cppbaseprojectpartbuilder-test.cpp
View File

@@ -156,7 +156,7 @@ TEST_F(BaseProjectPartBuilder, ProjectPartHasLatestLanguageVersionByDefault)
ASSERT_THAT(projectInfo.projectParts().size(), Eq(1));
const ProjectPart &projectPart = *projectInfo.projectParts().at(0);
ASSERT_THAT(projectPart.languageVersion, Eq(ProjectPart::CXX11));
ASSERT_THAT(projectPart.languageVersion, Eq(ProjectPart::LatestCxxVersion));
}
TEST_F(BaseProjectPartBuilder, ToolChainSetsLanguageVersion)
@@ -197,13 +197,13 @@ TEST_F(BaseProjectPartBuilder, ProjectFileKindsMatchProjectPartVersion)
const QList<ProjectPart::Ptr> projectParts = projectInfo.projectParts();
ASSERT_THAT(projectParts.size(), Eq(4));
ASSERT_THAT(projectParts.at(0)->languageVersion, Eq(ProjectPart::C11));
ASSERT_THAT(projectParts.at(0)->languageVersion, Eq(ProjectPart::LatestCVersion));
ASSERT_THAT(projectParts.at(0)->files.at(0).kind, Eq(ProjectFile::CHeader));
ASSERT_THAT(projectParts.at(1)->languageVersion, Eq(ProjectPart::C11));
ASSERT_THAT(projectParts.at(1)->languageVersion, Eq(ProjectPart::LatestCVersion));
ASSERT_THAT(projectParts.at(1)->files.at(0).kind, Eq(ProjectFile::ObjCHeader));
ASSERT_THAT(projectParts.at(2)->languageVersion, Eq(ProjectPart::CXX11));
ASSERT_THAT(projectParts.at(2)->languageVersion, Eq(ProjectPart::LatestCxxVersion));
ASSERT_THAT(projectParts.at(2)->files.at(0).kind, Eq(ProjectFile::CXXHeader));
ASSERT_THAT(projectParts.at(3)->languageVersion, Eq(ProjectPart::CXX11));
ASSERT_THAT(projectParts.at(3)->languageVersion, Eq(ProjectPart::LatestCxxVersion));
ASSERT_THAT(projectParts.at(3)->files.at(0).kind, Eq(ProjectFile::ObjCXXHeader));
}