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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
This commit is contained in:
Eike Ziller
2013-07-11 08:02:41 +02:00
parent 113c5600c9 8b390350df
commit ab0c3da08f
25 changed files with 3577 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -620,7 +620,10 @@ void QbsProjectNode::update(const qbs::ProjectData &prjData)
}
}
setDisplayName(prjData.name());
if (!prjData.name().isEmpty())
setDisplayName(prjData.name());
else
setDisplayName(m_project->displayName());
removeProjectNodes(toRemove);
addProjectNodes(toAdd);