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

CMake: Only pass the path mapper to the cbp-parser

Browse Source 
No need to pass in the complete kit. Remove a couple of unnecessary
namespace names.

Change-Id: I2ac895535a80b4a54a423ce62dbdede65b67437b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-13 11:36:00 +02:00
parent fe23c71414
commit b1433e2a05
5 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,11 +228,11 @@ void CMakeTool::setPathMapper(const CMakeTool::PathMapper &pathMapper)
m_pathMapper = pathMapper;
}
QString CMakeTool::mapAllPaths(const ProjectExplorer::Kit *kit, const QString &in) const
CMakeTool::PathMapper CMakeTool::pathMapper() const
{
if (m_pathMapper)
return m_pathMapper(kit, in);
return in;
return m_pathMapper;
return [](const QString &s) { return s; };
}
void CMakeTool::readInformation(CMakeTool::QueryType type) const