diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:14:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:51:15 +0100 |
| commit | c53ccceff1e1642b7704fa8b0681604c25a833a0 (patch) | |
| tree | 7258d63fba4dabd6f9e2f2f36089ce45df7fe3af /tests/unit/unittest/pchtaskgenerator-test.cpp | |
| parent | 62cafc1782369cde0605fbd6b1182a83d5473a12 (diff) | |
| parent | 429eb73ace5909e228a58bf8b067823e2be44212 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/debuggerkitinformation.cpp
src/plugins/languageclient/languageclientmanager.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/kit.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
Diffstat (limited to 'tests/unit/unittest/pchtaskgenerator-test.cpp')
| -rw-r--r-- | tests/unit/unittest/pchtaskgenerator-test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/unittest/pchtaskgenerator-test.cpp b/tests/unit/unittest/pchtaskgenerator-test.cpp index d85432baf25..a6946f7ccff 100644 --- a/tests/unit/unittest/pchtaskgenerator-test.cpp +++ b/tests/unit/unittest/pchtaskgenerator-test.cpp @@ -99,7 +99,7 @@ TEST_F(PchTaskGenerator, AddProjectParts) Field(&PchTaskSet::system, AllOf(Field(&PchTask::projectPartIds, ElementsAre("ProjectPart1")), Field(&PchTask::includes, ElementsAre(5)), - Field(&PchTask::allIncludes, IsEmpty()), + Field(&PchTask::sources, IsEmpty()), Field(&PchTask::compilerMacros, ElementsAre(CompilerMacro{"SE", "4", 4}, CompilerMacro{"WU", "5", 5})), Field(&PchTask::systemIncludeSearchPaths, @@ -116,7 +116,7 @@ TEST_F(PchTaskGenerator, AddProjectParts) &PchTaskSet::project, AllOf(Field(&PchTask::projectPartIds, ElementsAre("ProjectPart1")), Field(&PchTask::includes, ElementsAre(3)), - Field(&PchTask::allIncludes, ElementsAre(1, 2, 3, 4, 5)), + Field(&PchTask::sources, ElementsAre(1, 2, 3, 4, 5)), Field(&PchTask::compilerMacros, ElementsAre(CompilerMacro{"YI", "1", 1}, CompilerMacro{"SAN", "3", 3})), Field(&PchTask::systemIncludeSearchPaths, |