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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
This commit is contained in:
Orgad Shaneh
2016-11-14 11:15:40 +02:00
parent 1a2f649b70 b5f587efb5
commit 9c09ca9e42
175 changed files with 2145 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1322,8 +1322,6 @@ void QmakePriFileNode::save(const QStringList &lines)
FileSaver saver(m_projectFilePath.toString(), QIODevice::Text);
saver.write(lines.join(QLatin1Char('\n')).toLocal8Bit());
saver.finalize(Core::ICore::mainWindow());
m_project->projectManager()->notifyChanged(m_projectFilePath);
}
// This is a hack.
@@ -1673,16 +1671,6 @@ QString QmakeProFileNode::singleVariableValue(const QmakeVariable var) const
return values.isEmpty() ? QString() : values.first();
}
void QmakeProFileNode::emitProFileUpdatedRecursive()
{
emit m_project->proFileUpdated(this, m_validParse, m_parseInProgress);
foreach (ProjectNode *subNode, projectNodes()) {
if (QmakeProFileNode *node = dynamic_cast<QmakeProFileNode *>(subNode))
node->emitProFileUpdatedRecursive();
}
}
void QmakeProFileNode::setParseInProgressRecursive(bool b)
{
setParseInProgress(b);
@@ -2169,6 +2157,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult *evalResult)
qmakeProFileNode->setIncludedInExactParse(
result->exactSubdirs.contains(qmakeProFileNode->filePath())
&& pn->includedInExactParse());
qmakeProFileNode->setParseInProgress(true);
qmakeProFileNode->asyncUpdate();
toAdd << qmakeProFileNode;
}