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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/processreaper.cpp
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: I353a445b5862f63362ea954749b5565360951283
This commit is contained in:
Eike Ziller
2021-09-20 09:47:45 +02:00
parent cb5eaf4a63 24e3cb3ab9
commit 6a99368979
152 changed files with 1191 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1186,7 +1186,7 @@ QmakeProFile::~QmakeProFile()
m_parseFutureWatcher->cancel();
m_parseFutureWatcher->waitForFinished();
if (m_readerExact)
applyAsyncEvaluate();
applyAsyncEvaluate(false);
delete m_parseFutureWatcher;
}
cleanupProFileReaders();
@@ -1195,8 +1195,9 @@ QmakeProFile::~QmakeProFile()
void QmakeProFile::setupFutureWatcher()
{
m_parseFutureWatcher = new QFutureWatcher<Internal::QmakeEvalResult *>;
QObject::connect(m_parseFutureWatcher, &QFutureWatcherBase::finished,
[this](){ applyAsyncEvaluate(); });
QObject::connect(m_parseFutureWatcher, &QFutureWatcherBase::finished, [this]() {
applyAsyncEvaluate(true);
});
}
bool QmakeProFile::isParent(QmakeProFile *node)
@@ -1640,9 +1641,9 @@ void QmakeProFile::asyncEvaluate(QFutureInterface<QmakeEvalResult *> &fi, QmakeE
fi.reportResult(evalResult);
}
void QmakeProFile::applyAsyncEvaluate()
void QmakeProFile::applyAsyncEvaluate(bool apply)
{
if (m_parseFutureWatcher->isFinished())
if (apply)
applyEvaluate(m_parseFutureWatcher->result());
m_buildSystem->decrementPendingEvaluateFutures();
}