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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/baremetal/gdbserverproviderprocess.cpp

Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
This commit is contained in:
Eike Ziller
2015-12-07 15:55:17 +01:00
parent 11cb55a21f 89d8693107
commit 9554495bb1
41 changed files with 464 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/resourceeditor/resourcenode.cpp
View File

@@ -123,9 +123,9 @@ ResourceTopLevelNode::ResourceTopLevelNode(const Utils::FileName &filePath, Fold
Utils::FileName base = parent->filePath();
if (filePath.isChildOf(base))
setDisplayName(filePath.relativeChildPath(base).toString());
setDisplayName(filePath.relativeChildPath(base).toUserOutput());
else
setDisplayName(filePath.toString());
setDisplayName(filePath.toUserOutput());
}
ResourceTopLevelNode::~ResourceTopLevelNode()