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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
This commit is contained in:
Eike Ziller
2016-04-20 14:58:48 +02:00
parent 0eeee15a88 5dc690f234
commit ee8bf341c6
112 changed files with 794 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/cplusplus/Symbol.cpp vendored
View File

@@ -191,10 +191,10 @@ const StringLiteral *Symbol::fileId() const
}
const char *Symbol::fileName() const
{ return fileId()->chars(); }
{ return _fileId ? _fileId->chars() : ""; }
unsigned Symbol::fileNameLength() const
{ return fileId()->size(); }
{ return _fileId ? _fileId->size() : 0; }
const Name *Symbol::unqualifiedName() const
{