diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
| commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
| tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /tests/unit/unittest/mockpchtasksmerger.h | |
| parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
| parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'tests/unit/unittest/mockpchtasksmerger.h')
| -rw-r--r-- | tests/unit/unittest/mockpchtasksmerger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/unittest/mockpchtasksmerger.h b/tests/unit/unittest/mockpchtasksmerger.h index 39e73f9f55..0e6cbe1d4e 100644 --- a/tests/unit/unittest/mockpchtasksmerger.h +++ b/tests/unit/unittest/mockpchtasksmerger.h @@ -36,7 +36,7 @@ public: void(const ClangBackEnd::PchTaskSets &pchTaskSets, const Utils::SmallStringVector &toolChainArguments)); - MOCK_METHOD1(removePchTasks, void(const Utils::SmallStringVector &projectPartIds)); + MOCK_METHOD1(removePchTasks, void(const ClangBackEnd::ProjectPartIds &projectPartIds)); void mergeTasks(ClangBackEnd::PchTaskSets &&pchTaskSets, Utils::SmallStringVector &&toolChainArguments) override |