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

qmake: Fix WS

Browse Source 
Change-Id: Ib87bdf6c686e3bb37bdd55955d5e18de79d2729a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Tobias Hunger
2017-07-13 16:29:15 +02:00
parent 93bc0a9ada
commit 98764a44a7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1184,9 +1184,9 @@ void QmakeProFile::asyncUpdate()
m_parseFutureWatcher.waitForFinished(); m_parseFutureWatcher.waitForFinished();
QmakeEvalInput input = evalInput(); QmakeEvalInput input = evalInput();
QFuture<QmakeEvalResult *> future = Utils::runAsync(ProjectExplorerPlugin::sharedThreadPool(), QFuture<QmakeEvalResult *> future = Utils::runAsync(ProjectExplorerPlugin::sharedThreadPool(),
QThread::LowestPriority, QThread::LowestPriority,
&QmakeProFile::asyncEvaluate, &QmakeProFile::asyncEvaluate,
this, input); this, input);
m_parseFutureWatcher.setFuture(future); m_parseFutureWatcher.setFuture(future);
} }

2
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -493,7 +493,7 @@ void QmakeProject::incrementPendingEvaluateFutures()
{ {
++m_pendingEvaluateFuturesCount; ++m_pendingEvaluateFuturesCount;
m_asyncUpdateFutureInterface->setProgressRange(m_asyncUpdateFutureInterface->progressMinimum(), m_asyncUpdateFutureInterface->setProgressRange(m_asyncUpdateFutureInterface->progressMinimum(),
m_asyncUpdateFutureInterface->progressMaximum() + 1); m_asyncUpdateFutureInterface->progressMaximum() + 1);
} }
void QmakeProject::decrementPendingEvaluateFutures() void QmakeProject::decrementPendingEvaluateFutures()