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

CMakeTool: Fix reading from SDKtool file

Browse Source 
Change-Id: Ie1efbfe579c8d41ffd0795deaa3ee3759938862b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-07-02 15:11:22 +02:00
parent 7478c4aef1
commit ba70df8be7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -125,14 +125,12 @@ mergeTools(std::vector<std::unique_ptr<CMakeTool>> &sdkTools,
std::vector<std::unique_ptr<CMakeTool>> &userTools, std::vector<std::unique_ptr<CMakeTool>> &userTools,
std::vector<std::unique_ptr<CMakeTool>> &autoDetectedTools) std::vector<std::unique_ptr<CMakeTool>> &autoDetectedTools)
{ {
std::vector<std::unique_ptr<CMakeTool>> result; std::vector<std::unique_ptr<CMakeTool>> result = std::move(sdkTools);
while (userTools.size() > 0) { while (userTools.size() > 0) {
std::unique_ptr<CMakeTool> userTool = std::move(userTools[0]); std::unique_ptr<CMakeTool> userTool = std::move(userTools[0]);
userTools.erase(std::begin(userTools)); userTools.erase(std::begin(userTools));
if (auto sdkTool = Utils::take(sdkTools, Utils::equal(&CMakeTool::id, userTool->id()))) { if (!Utils::contains(result, Utils::equal(&CMakeTool::id, userTool->id()))) {
result.emplace_back(std::move(sdkTool.value()));
} else {
if (userTool->isAutoDetected() if (userTool->isAutoDetected()
&& !Utils::contains(autoDetectedTools, Utils::equal(&CMakeTool::cmakeExecutable, && !Utils::contains(autoDetectedTools, Utils::equal(&CMakeTool::cmakeExecutable,
userTool->cmakeExecutable()))) { userTool->cmakeExecutable()))) {