diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index caa1e115113..9dfb50d5f28 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -1489,7 +1489,7 @@ void QmakeProFile::asyncEvaluate(QFutureInterface &fi, QmakeE void QmakeProFile::applyAsyncEvaluate() { applyEvaluate(m_parseFutureWatcher.result()); - m_project->decrementPendingEvaluateFutures(validParse()); + m_project->decrementPendingEvaluateFutures(); } bool sortByParserNodes(Node *a, Node *b) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index c3b847447aa..e9a7c39b91e 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -500,24 +500,20 @@ void QmakeProject::startAsyncTimer(QmakeProFile::AsyncUpdateDelay delay) void QmakeProject::incrementPendingEvaluateFutures() { ++m_pendingEvaluateFuturesCount; - if (m_pendingEvaluateFuturesCount == 1) - m_totalEvaluationSuccess = true; m_asyncUpdateFutureInterface->setProgressRange(m_asyncUpdateFutureInterface->progressMinimum(), m_asyncUpdateFutureInterface->progressMaximum() + 1); } -void QmakeProject::decrementPendingEvaluateFutures(bool success) +void QmakeProject::decrementPendingEvaluateFutures() { --m_pendingEvaluateFuturesCount; - m_totalEvaluationSuccess = m_totalEvaluationSuccess && success; - m_asyncUpdateFutureInterface->setProgressValue(m_asyncUpdateFutureInterface->progressValue() + 1); if (m_pendingEvaluateFuturesCount == 0) { // We are done! setRootProjectNode(QmakeNodeTreeBuilder::buildTree(this)); - if (!m_totalEvaluationSuccess) + if (!m_rootProFile->validParse()) m_asyncUpdateFutureInterface->reportCanceled(); m_asyncUpdateFutureInterface->reportFinished(); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index b8d3192f098..717c11951bf 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -100,7 +100,7 @@ public: /// \internal void incrementPendingEvaluateFutures(); /// \internal - void decrementPendingEvaluateFutures(bool success); + void decrementPendingEvaluateFutures(); /// \internal bool wasEvaluateCanceled(); @@ -186,7 +186,6 @@ private: // cached data during project rescan QMakeGlobals *m_qmakeGlobals = nullptr; int m_qmakeGlobalsRefCnt = 0; - bool m_totalEvaluationSuccess = false; QString m_qmakeSysroot;