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

CMake: Project tree for server mode data

Browse Source 
Change-Id: Ief884a76c1b4211501dd6515b17b6e88a8e881e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-07 18:20:47 +01:00
parent 38f30e733f
commit 4b4dc9d06c
13 changed files with 484 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -298,9 +298,10 @@ void BuildDirManager::resetData()
m_reader->resetData();
m_cmakeCache.clear();
QTC_ASSERT(!m_futureInterface || m_futureInterface->isFinished(), return);
m_futureInterface.reset();
m_reader.reset(nullptr);
m_reader.reset();
}
bool BuildDirManager::updateCMakeStateBeforeBuild()
@@ -323,7 +324,7 @@ bool BuildDirManager::persistCMakeState()
return true;
}
void BuildDirManager::generateProjectTree(CMakeProjectNode *root)
void BuildDirManager::generateProjectTree(CMakeListsNode *root)
{
QTC_ASSERT(m_reader, return);
QTC_ASSERT(m_futureInterface, return);