forked from qt-creator/qt-creator
CMakePM: Have only one "Scan project tree" task
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:
@@ -269,11 +269,11 @@ void CMakeBuildSystem::triggerParsing()
|
||||
if (m_waitingForScan) {
|
||||
qCDebug(cmakeBuildSystemLog) << "Starting TreeScanner";
|
||||
QTC_CHECK(m_treeScanner.isFinished());
|
||||
m_treeScanner.asyncScanForFiles(projectDirectory());
|
||||
Core::ProgressManager::addTask(m_treeScanner.future(),
|
||||
tr("Scan \"%1\" project tree")
|
||||
.arg(project()->displayName()),
|
||||
"CMake.Scan.Tree");
|
||||
if (m_treeScanner.asyncScanForFiles(projectDirectory()))
|
||||
Core::ProgressManager::addTask(m_treeScanner.future(),
|
||||
tr("Scan \"%1\" project tree")
|
||||
.arg(project()->displayName()),
|
||||
"CMake.Scan.Tree");
|
||||
}
|
||||
|
||||
QTC_ASSERT(m_parameters.isValid(), return );
|
||||
|
Reference in New Issue
Block a user