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

CMake: Handle deletion of builddir better

Browse Source 
Change-Id: Ifeb35b14aba05c0e23a027b71f185ba20eed3e55
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-15 10:48:46 +01:00
parent 4a1a29d9c5
commit 6c382e134b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@
#include <QRegularExpression>
#include <QSet>
#include <QTemporaryDir>
#include <QTimer>
// --------------------------------------------------------------------
// Helper:
@@ -107,9 +106,13 @@ BuildDirManager::BuildDirManager(const Utils::FileName &sourceDir, const Project
QTC_CHECK(!m_buildDir.isEmpty());
QTC_CHECK(k);
m_reparseTimer.setSingleShot(true);
m_reparseTimer.setInterval(500);
connect(&m_reparseTimer, &QTimer::timeout, this, &BuildDirManager::forceReparse);
connect(m_watcher, &QFileSystemWatcher::fileChanged, this, [this]() {
if (!isBusy())
forceReparse();
m_reparseTimer.start();
});
QTimer::singleShot(0, this, &BuildDirManager::parse);
@@ -129,6 +132,12 @@ bool BuildDirManager::isBusy() const
void BuildDirManager::forceReparse()
{
if (isBusy()) {
m_cmakeProcess->disconnect();
m_cmakeProcess->deleteLater();
m_cmakeProcess = nullptr;
}
CMakeTool *tool = CMakeKitInformation::cmakeTool(m_kit);
const QString generator = CMakeGeneratorKitInformation::generator(m_kit);