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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I29979e76cb01bc94ddcd7868ca1cbc34afb14c5d
This commit is contained in:
Eike Ziller
2017-11-27 12:46:56 +01:00
parent 1697f97aff 63861c44c1
commit 8e1fefd8de
8 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1089,9 +1089,12 @@ QmakeProFile::QmakeProFile(QmakeProject *project, const FileName &filePath) :
QmakeProFile::~QmakeProFile()
{
qDeleteAll(m_extraCompilers);
m_parseFutureWatcher.cancel();
m_parseFutureWatcher.waitForFinished();
if (m_readerExact)
applyAsyncEvaluate();
cleanupProFileReaders();
}
bool QmakeProFile::isParent(QmakeProFile *node)
@@ -1491,7 +1494,8 @@ void QmakeProFile::asyncEvaluate(QFutureInterface<QmakeEvalResult *> &fi, QmakeE
void QmakeProFile::applyAsyncEvaluate()
{
applyEvaluate(m_parseFutureWatcher.result());
if (m_parseFutureWatcher.isFinished())
applyEvaluate(m_parseFutureWatcher.result());
m_project->decrementPendingEvaluateFutures();
}
@@ -1627,8 +1631,10 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
void QmakeProFile::cleanupProFileReaders()
{
m_project->destroyProFileReader(m_readerExact);
m_project->destroyProFileReader(m_readerCumulative);
if (m_readerExact)
m_project->destroyProFileReader(m_readerExact);
if (m_readerCumulative)
m_project->destroyProFileReader(m_readerCumulative);
m_readerExact = nullptr;
m_readerCumulative = nullptr;