summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-03-04 13:22:26 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-03-05 13:30:47 +0200
commitc9dffe319eb0f4b6312204c847b5173d070b9788 (patch)
treed7d04b9e858aeee374530a9a06b359da7babb8b8
parent795b676f22b0b198ab80f76b9a839d96831385d8 (diff)
Allow multiple extra paths to be specified
Change-Id: I6757501462941d0a06dd3b1ed9e238eb2e2c25bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--app/perfunwind.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/perfunwind.cpp b/app/perfunwind.cpp
index e1aeea8..76a7868 100644
--- a/app/perfunwind.cpp
+++ b/app/perfunwind.cpp
@@ -79,8 +79,15 @@ void PerfUnwind::registerElf(const PerfRecordMmap &mmap)
if (mmap.pid() != s_kernelPid) {
path.setFile(appPath + "/" + fileName);
if (!path.isFile()) {
- path.setFile(extraLibsPath);
- if (!findInExtraPath(path, fileName))
+ bool found = false;
+ foreach (const QString &extraPath, extraLibsPath.split(":")) {
+ path.setFile(extraPath);
+ if (findInExtraPath(path, fileName)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
path.setFile(systemRoot + mmap.filename());
}
} else { // kernel