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

~QmakeProFileNode: Simplify code

Browse Source 
Change-Id: I6d56b8637b4194b57c4c0df033d0bc7919e24aeb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-09-10 12:53:13 +02:00
parent 679d4e3582
commit 742e14f1e9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1596,11 +1596,8 @@ QmakeProFileNode::QmakeProFileNode(QmakeProject *project,
QmakeProFileNode::~QmakeProFileNode() QmakeProFileNode::~QmakeProFileNode()
{ {
m_parseFutureWatcher.waitForFinished(); m_parseFutureWatcher.waitForFinished();
if (m_readerExact) { if (m_readerExact)
// Oh we need to clean up applyAsyncEvaluate();
applyEvaluate(EvalAbort, true);
m_project->decrementPendingEvaluateFutures();
}
} }
bool QmakeProFileNode::isParent(QmakeProFileNode *node) bool QmakeProFileNode::isParent(QmakeProFileNode *node)

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

@@ -343,6 +343,7 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
m_projectFiles(new QmakeProjectFiles), m_projectFiles(new QmakeProjectFiles),
m_qmakeVfs(new QMakeVfs), m_qmakeVfs(new QMakeVfs),
m_qmakeGlobals(0), m_qmakeGlobals(0),
m_qmakeGlobalsRefCnt(0),
m_asyncUpdateFutureInterface(0), m_asyncUpdateFutureInterface(0),
m_pendingEvaluateFuturesCount(0), m_pendingEvaluateFuturesCount(0),
m_asyncUpdateState(NoState), m_asyncUpdateState(NoState),
@@ -376,6 +377,7 @@ QmakeProject::~QmakeProject()
QmakeProFileNode *root = m_rootProjectNode; QmakeProFileNode *root = m_rootProjectNode;
m_rootProjectNode = 0; m_rootProjectNode = 0;
delete root; delete root;
Q_ASSERT(m_qmakeGlobalsRefCnt == 0);
} }
void QmakeProject::updateFileList() void QmakeProject::updateFileList()