From bf87b6c310f653ca726b3a7e288c781638c3ac00 Mon Sep 17 00:00:00 2001 From: LiaoCheng <820564830@qq.com> Date: Sat, 7 May 2022 18:18:05 +0800 Subject: [PATCH] 1 handler/QBreakpadHandler.cpp: implement 'QString QBreakpadHandler::dumpPath() const' 2 third_party/breakpad.pri: correct the include path of breakpad's third_party(such as lss) --- handler/QBreakpadHandler.cpp | 5 +++ third_party/breakpad.pri | 79 ++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/handler/QBreakpadHandler.cpp b/handler/QBreakpadHandler.cpp index a68b7f94..03a8e0eb 100644 --- a/handler/QBreakpadHandler.cpp +++ b/handler/QBreakpadHandler.cpp @@ -144,6 +144,11 @@ QString QBreakpadHandler::uploadUrl() const return d->uploadUrl.toString(); } +QString QBreakpadHandler::dumpPath() const +{ + return d->dumpPath; +} + QStringList QBreakpadHandler::dumpFileList() const { if(!d->dumpPath.isNull() && !d->dumpPath.isEmpty()) { diff --git a/third_party/breakpad.pri b/third_party/breakpad.pri index 3dd1c182..5e6fd9dc 100644 --- a/third_party/breakpad.pri +++ b/third_party/breakpad.pri @@ -1,61 +1,62 @@ CONFIG += c++11 # internal file, used but breakpad-qt -BREAKPAD_PATH = $$PWD/breakpad/src -INCLUDEPATH += $$BREAKPAD_PATH $$PWD/../ +BREAKPAD_PATH = $$PWD/breakpad #for breakpad's third_patry(such as lss) +BREAKPAD_PATH_SRC = $$PWD/breakpad/src +INCLUDEPATH += $$BREAKPAD_PATH $$BREAKPAD_PATH_SRC # every *nix unix { SOURCES += \ - $$BREAKPAD_PATH/client/minidump_file_writer.cc \ - $$BREAKPAD_PATH/common/convert_UTF.cc \ - $$BREAKPAD_PATH/common/md5.cc \ - $$BREAKPAD_PATH/common/string_conversion.cc + $$BREAKPAD_PATH_SRC/client/minidump_file_writer.cc \ + $$BREAKPAD_PATH_SRC/common/convert_UTF.cc \ + $$BREAKPAD_PATH_SRC/common/md5.cc \ + $$BREAKPAD_PATH_SRC/common/string_conversion.cc } # mac os x mac { OBJECTIVE_SOURCES += \ - $$BREAKPAD_PATH/client/mac/crash_generation/crash_generation_client.cc \ - $$BREAKPAD_PATH/client/mac/handler/breakpad_nlist_64.cc \ - $$BREAKPAD_PATH/client/mac/handler/dynamic_images.cc \ - $$BREAKPAD_PATH/client/mac/handler/exception_handler.cc \ - $$BREAKPAD_PATH/client/mac/handler/minidump_generator.cc \ - $$BREAKPAD_PATH/common/mac/MachIPC.mm \ - $$BREAKPAD_PATH/common/mac/bootstrap_compat.cc \ - $$BREAKPAD_PATH/common/mac/file_id.cc \ - $$BREAKPAD_PATH/common/mac/macho_id.cc \ - $$BREAKPAD_PATH/common/mac/macho_utilities.cc \ - $$BREAKPAD_PATH/common/mac/macho_walker.cc \ - $$BREAKPAD_PATH/common/mac/string_utilities.cc + $$BREAKPAD_PATH_SRC/client/mac/crash_generation/crash_generation_client.cc \ + $$BREAKPAD_PATH_SRC/client/mac/handler/breakpad_nlist_64.cc \ + $$BREAKPAD_PATH_SRC/client/mac/handler/dynamic_images.cc \ + $$BREAKPAD_PATH_SRC/client/mac/handler/exception_handler.cc \ + $$BREAKPAD_PATH_SRC/client/mac/handler/minidump_generator.cc \ + $$BREAKPAD_PATH_SRC/common/mac/MachIPC.mm \ + $$BREAKPAD_PATH_SRC/common/mac/bootstrap_compat.cc \ + $$BREAKPAD_PATH_SRC/common/mac/file_id.cc \ + $$BREAKPAD_PATH_SRC/common/mac/macho_id.cc \ + $$BREAKPAD_PATH_SRC/common/mac/macho_utilities.cc \ + $$BREAKPAD_PATH_SRC/common/mac/macho_walker.cc \ + $$BREAKPAD_PATH_SRC/common/mac/string_utilities.cc } # other *nix unix:!mac { SOURCES += \ - $$BREAKPAD_PATH/client/linux/crash_generation/crash_generation_client.cc \ - $$BREAKPAD_PATH/client/linux/dump_writer_common/thread_info.cc \ - $$BREAKPAD_PATH/client/linux/dump_writer_common/ucontext_reader.cc \ - $$BREAKPAD_PATH/client/linux/handler/exception_handler.cc \ - $$BREAKPAD_PATH/client/linux/handler/minidump_descriptor.cc \ - $$BREAKPAD_PATH/client/linux/log/log.cc \ - $$BREAKPAD_PATH/client/linux/microdump_writer/microdump_writer.cc \ - $$BREAKPAD_PATH/client/linux/minidump_writer/linux_core_dumper.cc \ - $$BREAKPAD_PATH/client/linux/minidump_writer/linux_dumper.cc \ - $$BREAKPAD_PATH/client/linux/minidump_writer/linux_ptrace_dumper.cc \ - $$BREAKPAD_PATH/client/linux/minidump_writer/minidump_writer.cc \ - $$BREAKPAD_PATH/common/linux/breakpad_getcontext.S \ - $$BREAKPAD_PATH/common/linux/elfutils.cc \ - $$BREAKPAD_PATH/common/linux/file_id.cc \ - $$BREAKPAD_PATH/common/linux/guid_creator.cc \ - $$BREAKPAD_PATH/common/linux/linux_libc_support.cc \ - $$BREAKPAD_PATH/common/linux/memory_mapped_file.cc \ - $$BREAKPAD_PATH/common/linux/safe_readlink.cc + $$BREAKPAD_PATH_SRC/client/linux/crash_generation/crash_generation_client.cc \ + $$BREAKPAD_PATH_SRC/client/linux/dump_writer_common/thread_info.cc \ + $$BREAKPAD_PATH_SRC/client/linux/dump_writer_common/ucontext_reader.cc \ + $$BREAKPAD_PATH_SRC/client/linux/handler/exception_handler.cc \ + $$BREAKPAD_PATH_SRC/client/linux/handler/minidump_descriptor.cc \ + $$BREAKPAD_PATH_SRC/client/linux/log/log.cc \ + $$BREAKPAD_PATH_SRC/client/linux/microdump_writer/microdump_writer.cc \ + $$BREAKPAD_PATH_SRC/client/linux/minidump_writer/linux_core_dumper.cc \ + $$BREAKPAD_PATH_SRC/client/linux/minidump_writer/linux_dumper.cc \ + $$BREAKPAD_PATH_SRC/client/linux/minidump_writer/linux_ptrace_dumper.cc \ + $$BREAKPAD_PATH_SRC/client/linux/minidump_writer/minidump_writer.cc \ + $$BREAKPAD_PATH_SRC/common/linux/breakpad_getcontext.S \ + $$BREAKPAD_PATH_SRC/common/linux/elfutils.cc \ + $$BREAKPAD_PATH_SRC/common/linux/file_id.cc \ + $$BREAKPAD_PATH_SRC/common/linux/guid_creator.cc \ + $$BREAKPAD_PATH_SRC/common/linux/linux_libc_support.cc \ + $$BREAKPAD_PATH_SRC/common/linux/memory_mapped_file.cc \ + $$BREAKPAD_PATH_SRC/common/linux/safe_readlink.cc } win32 { SOURCES += \ - $$BREAKPAD_PATH/client/windows/crash_generation/crash_generation_client.cc \ - $$BREAKPAD_PATH/client/windows/handler/exception_handler.cc \ - $$BREAKPAD_PATH/common/windows/guid_string.cc + $$BREAKPAD_PATH_SRC/client/windows/crash_generation/crash_generation_client.cc \ + $$BREAKPAD_PATH_SRC/client/windows/handler/exception_handler.cc \ + $$BREAKPAD_PATH_SRC/common/windows/guid_string.cc }