summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanager_test.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2014-01-07 11:54:45 +0100
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-01-07 14:25:31 +0100
commit1362d9d262cb18f53a7d55717852ad63d501e480 (patch)
tree8cb8008bd65f997efea4f8909d9b7f7d1ba437af /src/plugins/cpptools/cppmodelmanager_test.cpp
parent6de1958af295336c86d883200cfeeb6f1a57876b (diff)
downloadqt-creator-1362d9d262cb18f53a7d55717852ad63d501e480.tar.gz
CppTools: Fix test_modelmanager_defines_per_project
The example project parts had no project file set and thus the "right" project part could not be determined in cppeditor.cpp:718. Change-Id: I088571e9d3c3c8790670bbdd8e68190835a85ad5 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanager_test.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index a7a6aa222e..3e9f3aafe3 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -806,6 +806,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project()
Project *project = helper.createProject(_("test_modelmanager_defines_per_project"));
ProjectPart::Ptr part1(new ProjectPart);
+ part1->projectFile = QLatin1String("project1.projectfile");
part1->files.append(ProjectFile(main1File, ProjectFile::CXXSource));
part1->files.append(ProjectFile(header, ProjectFile::CXXHeader));
part1->cxxVersion = ProjectPart::CXX11;
@@ -814,6 +815,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project()
part1->includePaths = QStringList() << testDataDirectory.includeDir(false);
ProjectPart::Ptr part2(new ProjectPart);
+ part2->projectFile = QLatin1String("project1.projectfile");
part2->files.append(ProjectFile(main2File, ProjectFile::CXXSource));
part2->files.append(ProjectFile(header, ProjectFile::CXXHeader));
part2->cxxVersion = ProjectPart::CXX11;
@@ -878,6 +880,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project_pch()
Project *project = helper.createProject(_("test_modelmanager_defines_per_project_pch"));
ProjectPart::Ptr part1(new ProjectPart);
+ part1->projectFile = QLatin1String("project1.projectfile");
part1->files.append(ProjectFile(main1File, ProjectFile::CXXSource));
part1->files.append(ProjectFile(header, ProjectFile::CXXHeader));
part1->cxxVersion = ProjectPart::CXX11;
@@ -886,6 +889,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project_pch()
part1->includePaths = QStringList() << testDataDirectory.includeDir(false);
ProjectPart::Ptr part2(new ProjectPart);
+ part2->projectFile = QLatin1String("project2.projectfile");
part2->files.append(ProjectFile(main2File, ProjectFile::CXXSource));
part2->files.append(ProjectFile(header, ProjectFile::CXXHeader));
part2->cxxVersion = ProjectPart::CXX11;