From 919ae39cb5385158b23584af8a3a8c7d47ffcf33 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 8 Aug 2024 01:45:16 +0200 Subject: [PATCH] Set up crash handling --- .kde-ci.yml | 1 + CMakeLists.txt | 1 + src/CMakeLists.txt | 2 +- src/main.cpp | 6 ++++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.kde-ci.yml b/.kde-ci.yml index 4a929954..e0a075a8 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -18,6 +18,7 @@ Dependencies: - 'on': ['Linux', 'FreeBSD', 'Windows'] 'require': 'frameworks/qqc2-desktop-style': '@latest-kf6' + 'frameworks/kcrash': '@latest-kf6' Options: require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff --git a/CMakeLists.txt b/CMakeLists.txt index 5911e66a..97c33efb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,7 @@ if (ANDROID) find_package(Gradle) else() find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets DBus) + find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Crash) endif() add_definitions(-DQT_NO_CAST_FROM_ASCII diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5a85dea6..35397d8b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -329,7 +329,7 @@ if(ANDROID) ) ecm_add_android_apk(kasts ANDROID_DIR ${CMAKE_SOURCE_DIR}/android) else() - target_link_libraries(kasts PRIVATE Qt::Widgets) + target_link_libraries(kasts PRIVATE Qt::Widgets KF6::Crash) endif() install(TARGETS kasts ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/main.cpp b/src/main.cpp index 5f33612a..d6d29787 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,8 @@ #include #else #include + +#include #endif #include @@ -114,6 +116,10 @@ int main(int argc, char *argv[]) about.addAuthor(i18n("Bart De Vries"), QString(), QStringLiteral("bart@mogwai.be")); KAboutData::setApplicationData(about); +#ifndef Q_OS_ANDROID + KCrash::initialize(); +#endif + about.setupCommandLine(&parser); parser.process(app); QString feedURL = parser.value(addFeedOption);