diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-28 09:36:11 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-28 09:36:11 +0100 |
commit | 0d99607ad3e7cadf6b1d062d517d229169f5eb21 (patch) | |
tree | cf6e79b7b15b3f45e16d8c7edf8fd0dde172cfac | |
parent | 65375af086973b729efb300ed8d9911e9df25533 (diff) | |
parent | 7fd9e992bbe30cb9f2767807967226c25cc77285 (diff) |
Merge remote-tracking branch 'origin/4.15' into 7.0
Change-Id: I4855a81ce48a117c6a34e0a4770b0bf5ee49473a
-rw-r--r-- | app/CMakeLists.txt | 6 | ||||
-rw-r--r-- | app/perfdwarfdiecache.cpp | 10 | ||||
-rw-r--r-- | app/perfkallsyms.cpp | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index b324907..6efe84b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -25,9 +25,9 @@ add_qtc_library(perfparser_lib STATIC ) if (Zstd_FOUND) - target_include_directories(perfparser_lib PRIVATE ${Zstd_INCLUDE_DIR}) - target_link_libraries(perfparser_lib PRIVATE ${Zstd_LIBRARY}) - target_compile_definitions(perfparser_lib PRIVATE HAVE_ZSTD=1) + target_include_directories(perfparser_lib PUBLIC ${Zstd_INCLUDE_DIR}) + target_link_libraries(perfparser_lib PUBLIC ${Zstd_LIBRARY}) + target_compile_definitions(perfparser_lib PUBLIC HAVE_ZSTD=1) endif() add_qtc_executable(perfparser diff --git a/app/perfdwarfdiecache.cpp b/app/perfdwarfdiecache.cpp index 4b70c0b..12dbb67 100644 --- a/app/perfdwarfdiecache.cpp +++ b/app/perfdwarfdiecache.cpp @@ -17,6 +17,8 @@ ** ****************************************************************************/ +#include <time.h> + #include "perfdwarfdiecache.h" #include "perfeucompat.h" @@ -186,7 +188,7 @@ void prependScopeNames(QByteArray &name, Dwarf_Die *die, QHash<Dwarf_Off, QByteA if (auto scopeLinkageName = linkageName(scope)) { // prepend the fully qualified linkage name name.prepend("::"); - cacheOps.append({scopeOffset, name.size()}); + cacheOps.append({scopeOffset, int(name.size())}); // we have to demangle the scope linkage name, otherwise we get a // mish-mash of mangled and non-mangled names name.prepend(demangle(scopeLinkageName)); @@ -197,15 +199,15 @@ void prependScopeNames(QByteArray &name, Dwarf_Die *die, QHash<Dwarf_Off, QByteA if (auto scopeName = dwarf_diename(scope)) { // prepend this scope's name, e.g. the class or namespace name name.prepend("::"); - cacheOps.append({scopeOffset, name.size()}); + cacheOps.append({scopeOffset, int(name.size())}); name.prepend(scopeName); } if (auto specification = specificationDie(scope, &dieMem)) { eu_compat_free(scopes); scopes = nullptr; - cacheOps.append({scopeOffset, name.size()}); - cacheOps.append({dwarf_dieoffset(specification), name.size()}); + cacheOps.append({scopeOffset, int(name.size())}); + cacheOps.append({dwarf_dieoffset(specification), int(name.size())}); // follow the scope's specification DIE instead prependScopeNames(name, specification, cache); break; diff --git a/app/perfkallsyms.cpp b/app/perfkallsyms.cpp index 6330357..123549a 100644 --- a/app/perfkallsyms.cpp +++ b/app/perfkallsyms.cpp @@ -20,6 +20,7 @@ #include "perfkallsyms.h" #include <QFile> +#include <QLocale> #include <QTextStream> #include <algorithm> |