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

CMake: Small updates to tea leaf reader

Browse Source 
Change-Id: Ie68ed562415ee0024254729ea95591b59bb8f0cf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-28 17:01:05 +02:00
parent 73dee5193c
commit 6ad21cab82
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -353,7 +353,7 @@ void TeaLeafReader::generateProjectTree(CMakeProjectNode *root)
QSet<Id> TeaLeafReader::updateCodeModel(CppTools::ProjectPartBuilder &ppBuilder)
{
QSet<Id> languages;
ToolChain *tc = ToolChainManager::findToolChain(m_parameters.toolChainId);
const ToolChain *tc = ToolChainManager::findToolChain(m_parameters.toolChainId);
const FileName sysroot = m_parameters.sysRoot;
QHash<QString, QStringList> targetDataCache;
@@ -364,7 +364,7 @@ QSet<Id> TeaLeafReader::updateCodeModel(CppTools::ProjectPartBuilder &ppBuilder)
// CMake shuffles the include paths that it reports via the CodeBlocks generator
// So remove the toolchain include paths, so that at least those end up in the correct
// place.
QStringList cxxflags = getCXXFlagsFor(cbt, targetDataCache);
const QStringList cxxflags = getCXXFlagsFor(cbt, targetDataCache);
QSet<FileName> tcIncludes;
QStringList includePaths;
if (tc) {
@@ -413,8 +413,7 @@ void TeaLeafReader::extractData()
{
const FileName srcDir = m_parameters.sourceDirectory;
const FileName bldDir = m_parameters.buildDirectory;
const FileName topCMake
= FileName::fromString(srcDir.toString() + QLatin1String("/CMakeLists.txt"));
const FileName topCMake = Utils::FileName(srcDir).appendPath("CMakeLists.txt");
resetData();