From dd9d69f09e8060fd4cf4600b7129296db0ea2bb3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 4 Apr 2016 11:25:36 +0200 Subject: [PATCH] Qmake: Unify cleanup of readers in nodes Change-Id: I2387342667d143235e2b147ba1c0971954b0beb7 Reviewed-by: Orgad Shaneh --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 65611128b0a..050fe56f992 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -2107,9 +2107,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult) // we are changing what is executed in that case if (result->state == EvalResult::EvalFail || m_project->wasEvaluateCanceled()) { m_validParse = false; - m_project->destroyProFileReader(m_readerExact); - m_project->destroyProFileReader(m_readerCumulative); - m_readerExact = m_readerCumulative = 0; + cleanupProFileReaders(); setValidParseRecursive(false); setParseInProgressRecursive(false); @@ -2305,8 +2303,8 @@ void QmakeProFileNode::cleanupProFileReaders() m_project->destroyProFileReader(m_readerExact); m_project->destroyProFileReader(m_readerCumulative); - m_readerExact = 0; - m_readerCumulative = 0; + m_readerExact = nullptr; + m_readerCumulative = nullptr; } QStringList QmakeProFileNode::fileListForVar(QtSupport::ProFileReader *readerExact, QtSupport::ProFileReader *readerCumulative,