summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-06-04 16:32:28 +0200
committerEike Ziller <eike.ziller@qt.io>2018-06-04 16:32:28 +0200
commitce6d7583461ef7391718c74fb3b30f6347631c82 (patch)
tree09e72b0297f01c7cd14c82ac7b02b993b18c4f3c
parentedd370f091e924b50791ed093d556b2803dbf075 (diff)
parenta984bbb6c805cdac3ab3b5e9787b2c587c7e3a9c (diff)
Merge remote-tracking branch 'origin/4.7'
-rw-r--r--app/perfsymboltable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/perfsymboltable.cpp b/app/perfsymboltable.cpp
index c5b3c6b..986a463 100644
--- a/app/perfsymboltable.cpp
+++ b/app/perfsymboltable.cpp
@@ -292,7 +292,7 @@ QFileInfo PerfSymbolTable::findFile(const char *path, const QString &fileName,
void PerfSymbolTable::registerElf(const PerfRecordMmap &mmap, const QByteArray &buildId)
{
- QLatin1String filePath(mmap.filename());
+ QString filePath(mmap.filename());
// special regions, such as [heap], [vdso], [stack], ... as well as //anon
const bool isSpecialRegion = (filePath.startsWith('[') && filePath.endsWith(']'))
|| filePath.startsWith(QLatin1String("/dev/"))