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

QmakeProject: Make initial parse use the async parsing

Browse Source 
Task-number: QTCREATORBUG-12123
Change-Id: I79dcd684fe826108189db521c392c0f1d7632f88
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-09-26 15:24:32 +02:00
parent 742e14f1e9
commit cb068421b9
4 changed files with 30 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1750,14 +1750,6 @@ EvalInput QmakeProFileNode::evalInput() const
return input;
}
void QmakeProFileNode::update()
{
setParseInProgressRecursive(true);
setupReader();
EvalResult *evalResult = evaluate(evalInput());
applyEvaluate(evalResult, false);
}
void QmakeProFileNode::setupReader()
{
Q_ASSERT(!m_readerExact);
@@ -2005,7 +1997,7 @@ void QmakeProFileNode::asyncEvaluate(QFutureInterface<EvalResult *> &fi, EvalInp
void QmakeProFileNode::applyAsyncEvaluate()
{
applyEvaluate(m_parseFutureWatcher.result(), true);
applyEvaluate(m_parseFutureWatcher.result());
m_project->decrementPendingEvaluateFutures();
}
@@ -2014,7 +2006,7 @@ bool sortByNodes(Node *a, Node *b)
return a->path() < b->path();
}
void QmakeProFileNode::applyEvaluate(EvalResult *evalResult, bool async)
void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
{
QScopedPointer<EvalResult> result(evalResult);
if (!m_readerExact)
@@ -2175,10 +2167,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult, bool async)
// So to compare that later parse with the sync one
QmakeProFileNode *proFileNode = static_cast<QmakeProFileNode *>(*existingIt);
proFileNode->setIncludedInExactParse(result->exactSubdirs.contains(proFileNode->path()) && includedInExactParse());
if (async)
proFileNode->asyncUpdate();
else
proFileNode->update();
proFileNode->asyncUpdate();
}
++existingIt;
// newCumalativeIt and newExactIt are already incremented
@@ -2211,10 +2200,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult, bool async)
QmakeProFileNode *qmakeProFileNode = new QmakeProFileNode(m_project, nodeToAdd);
qmakeProFileNode->setParentFolderNode(this); // Needed for loop detection
qmakeProFileNode->setIncludedInExactParse(result->exactSubdirs.contains(qmakeProFileNode->path()) && includedInExactParse());
if (async)
qmakeProFileNode->asyncUpdate();
else
qmakeProFileNode->update();
qmakeProFileNode->asyncUpdate();
toAdd << qmakeProFileNode;
}
}