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

CMakePM: Have only one "Scan project tree" task

Browse Source 
Check if asyncScanForFiles returns true, which means it added
a future, which then can be used for Core::ProgressManager::addTask

Task-number: QTCREATORBUG-24564
Change-Id: I347c027e676023a782e7d4822fe2d51385888a64
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2021-05-28 18:09:20 +02:00
parent 07b0aa89f5
commit 637a20c34c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -269,11 +269,11 @@ void CMakeBuildSystem::triggerParsing()
if (m_waitingForScan) { if (m_waitingForScan) {
qCDebug(cmakeBuildSystemLog) << "Starting TreeScanner"; qCDebug(cmakeBuildSystemLog) << "Starting TreeScanner";
QTC_CHECK(m_treeScanner.isFinished()); QTC_CHECK(m_treeScanner.isFinished());
m_treeScanner.asyncScanForFiles(projectDirectory()); if (m_treeScanner.asyncScanForFiles(projectDirectory()))
Core::ProgressManager::addTask(m_treeScanner.future(), Core::ProgressManager::addTask(m_treeScanner.future(),
tr("Scan \"%1\" project tree") tr("Scan \"%1\" project tree")
.arg(project()->displayName()), .arg(project()->displayName()),
"CMake.Scan.Tree"); "CMake.Scan.Tree");
} }
QTC_ASSERT(m_parameters.isValid(), return ); QTC_ASSERT(m_parameters.isValid(), return );