diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
| commit | ee8bf341c6f64096c6ccfeefd3b6b8a85fe91c0b (patch) | |
| tree | 4dd8b097d0d2acc17f1a13e0e99debfc92b36466 /src/libs/3rdparty/cplusplus | |
| parent | 0eeee15a887a8180c1c28dc9f4929b066e096136 (diff) | |
| parent | 5dc690f234ec7bb5dcdb11a610a4ecbee6dc4d64 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/projectexplorer/session.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Symbol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/3rdparty/cplusplus/Symbol.cpp b/src/libs/3rdparty/cplusplus/Symbol.cpp index ae20b14bb7..e98b33a8a7 100644 --- a/src/libs/3rdparty/cplusplus/Symbol.cpp +++ b/src/libs/3rdparty/cplusplus/Symbol.cpp @@ -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 { |