Commit 742e14f1 authored by Daniel Teske's avatar Daniel Teske

~QmakeProFileNode: Simplify code

Change-Id: I6d56b8637b4194b57c4c0df033d0bc7919e24aeb
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 679d4e35
......@@ -1596,11 +1596,8 @@ QmakeProFileNode::QmakeProFileNode(QmakeProject *project,
QmakeProFileNode::~QmakeProFileNode()
{
m_parseFutureWatcher.waitForFinished();
if (m_readerExact) {
// Oh we need to clean up
applyEvaluate(EvalAbort, true);
m_project->decrementPendingEvaluateFutures();
}
if (m_readerExact)
applyAsyncEvaluate();
}
bool QmakeProFileNode::isParent(QmakeProFileNode *node)
......
......@@ -343,6 +343,7 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
m_projectFiles(new QmakeProjectFiles),
m_qmakeVfs(new QMakeVfs),
m_qmakeGlobals(0),
m_qmakeGlobalsRefCnt(0),
m_asyncUpdateFutureInterface(0),
m_pendingEvaluateFuturesCount(0),
m_asyncUpdateState(NoState),
......@@ -376,6 +377,7 @@ QmakeProject::~QmakeProject()
QmakeProFileNode *root = m_rootProjectNode;
m_rootProjectNode = 0;
delete root;
Q_ASSERT(m_qmakeGlobalsRefCnt == 0);
}
void QmakeProject::updateFileList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment