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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
This commit is contained in:
Eike Ziller
2016-04-05 14:11:47 +02:00
parent c8c6c8ec50 1ec4bbb029
commit 1ae483fc83
45 changed files with 165 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,6 +299,10 @@ QmakeProject::~QmakeProject()
{
m_codeModelFuture.cancel();
m_asyncUpdateState = ShuttingDown;
// Make sure root node (and associated readers) are shut hown before proceeding
setRootProjectNode(nullptr);
projectManager()->unregisterProject(this);
delete m_projectFiles;
m_cancelEvaluate = true;
@@ -392,7 +396,7 @@ void QmakeProject::updateCppCodeModel()
typedef CppTools::ProjectPart ProjectPart;
typedef CppTools::ProjectFile ProjectFile;
Kit *k = 0;
Kit *k = nullptr;
if (Target *target = activeTarget())
k = target->kit();
else
@@ -729,7 +733,7 @@ void QmakeProject::decrementPendingEvaluateFutures()
m_asyncUpdateFutureInterface->reportFinished();
delete m_asyncUpdateFutureInterface;
m_asyncUpdateFutureInterface = 0;
m_asyncUpdateFutureInterface = nullptr;
m_cancelEvaluate = false;
// TODO clear the profile cache ?
@@ -940,7 +944,7 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFileNo
}
++m_qmakeGlobalsRefCnt;
QtSupport::ProFileReader *reader = new QtSupport::ProFileReader(m_qmakeGlobals, m_qmakeVfs);
auto reader = new QtSupport::ProFileReader(m_qmakeGlobals, m_qmakeVfs);
reader->setOutputDir(qmakeProFileNode->buildDir());
@@ -968,7 +972,7 @@ void QmakeProject::destroyProFileReader(QtSupport::ProFileReader *reader)
QtSupport::ProFileCacheManager::instance()->decRefCount();
delete m_qmakeGlobals;
m_qmakeGlobals = 0;
m_qmakeGlobals = nullptr;
}
}