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

Qmake: Deactivate parse guard before it can cause trouble

Browse Source 
... in the QmakeBuildSystem destructor

Change-Id: I23336cc0b72673fd2c63235b1c568439159d3d8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-06 17:22:47 +01:00
parent 7e326657e9
commit 278e981422
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -249,9 +249,11 @@ void QmakeBuildConfiguration::updateProblemLabel()
} }
const auto bs = qmakeBuildSystem(); const auto bs = qmakeBuildSystem();
if (bs->rootProFile()->parseInProgress() || !bs->rootProFile()->validParse()) { if (QmakeProFile *rootProFile = bs->rootProFile()) {
buildDirectoryAspect()->setProblem({}); if (rootProFile->parseInProgress() || !rootProFile->validParse()) {
return; buildDirectoryAspect()->setProblem({});
return;
}
} }
bool targetMismatch = false; bool targetMismatch = false;

1
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -231,6 +231,7 @@ QmakeBuildSystem::QmakeBuildSystem(QmakeBuildConfiguration *bc)
QmakeBuildSystem::~QmakeBuildSystem() QmakeBuildSystem::~QmakeBuildSystem()
{ {
m_guard = {};
delete m_cppCodeModelUpdater; delete m_cppCodeModelUpdater;
m_cppCodeModelUpdater = nullptr; m_cppCodeModelUpdater = nullptr;
m_asyncUpdateState = ShuttingDown; m_asyncUpdateState = ShuttingDown;