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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
This commit is contained in:
Oswald Buddenhagen
2014-03-18 14:46:29 +01:00
parent 0d303db8c2 93184f7959
commit 868428cc63
439 changed files with 4360 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1568,9 +1568,9 @@ bool QmakeProFileNode::isParent(QmakeProFileNode *node)
return false;
}
bool QmakeProFileNode::hasBuildTargets() const
bool QmakeProFileNode::showInSimpleTree() const
{
return hasBuildTargets(projectType());
return showInSimpleTree(projectType()) || m_project->rootProjectNode() == this;
}
ProjectExplorer::FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files, Node *context) const
@@ -1579,7 +1579,7 @@ ProjectExplorer::FolderNode::AddNewInformation QmakeProFileNode::addNewInformati
return AddNewInformation(QFileInfo(path()).fileName(), context == this ? 120 : 100);
}
bool QmakeProFileNode::hasBuildTargets(QmakeProjectType projectType) const
bool QmakeProFileNode::showInSimpleTree(QmakeProjectType projectType) const
{
return (projectType == ApplicationTemplate || projectType == LibraryTemplate);
}
@@ -1789,15 +1789,15 @@ void QmakeProFileNode::applyEvaluate(EvalResult evalResult, bool async)
removeProjectNodes(subProjectNodes());
removeFolderNodes(subFolderNodes());
bool changesHasBuildTargets = hasBuildTargets() ^ hasBuildTargets(projectType);
bool changesShowInSimpleTree = showInSimpleTree() ^ showInSimpleTree(projectType);
if (changesHasBuildTargets)
aboutToChangeHasBuildTargets();
if (changesShowInSimpleTree)
aboutToChangeShowInSimpleTree();
m_projectType = projectType;
if (changesHasBuildTargets)
hasBuildTargetsChanged();
if (changesShowInSimpleTree)
showInSimpleTreeChanged();
// really emit here? or at the end? Nobody is connected to this signal at the moment
// so we kind of can ignore that question for now