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

Qmake: Unify cleanup of readers in nodes

Browse Source 
Change-Id: I2387342667d143235e2b147ba1c0971954b0beb7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2016-04-04 11:25:36 +02:00
parent dc16ca8552
commit dd9d69f09e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2107,9 +2107,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
// we are changing what is executed in that case // we are changing what is executed in that case
if (result->state == EvalResult::EvalFail || m_project->wasEvaluateCanceled()) { if (result->state == EvalResult::EvalFail || m_project->wasEvaluateCanceled()) {
m_validParse = false; m_validParse = false;
m_project->destroyProFileReader(m_readerExact); cleanupProFileReaders();
m_project->destroyProFileReader(m_readerCumulative);
m_readerExact = m_readerCumulative = 0;
setValidParseRecursive(false); setValidParseRecursive(false);
setParseInProgressRecursive(false); setParseInProgressRecursive(false);
@@ -2305,8 +2303,8 @@ void QmakeProFileNode::cleanupProFileReaders()
m_project->destroyProFileReader(m_readerExact); m_project->destroyProFileReader(m_readerExact);
m_project->destroyProFileReader(m_readerCumulative); m_project->destroyProFileReader(m_readerCumulative);
m_readerExact = 0; m_readerExact = nullptr;
m_readerCumulative = 0; m_readerCumulative = nullptr;
} }
QStringList QmakeProFileNode::fileListForVar(QtSupport::ProFileReader *readerExact, QtSupport::ProFileReader *readerCumulative, QStringList QmakeProFileNode::fileListForVar(QtSupport::ProFileReader *readerExact, QtSupport::ProFileReader *readerCumulative,