Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

KDESupport: Use KCrash for crash reporting

Browse Source
This commit is contained in:
David Rosca 2018-03-31 16:43:41 +02:00
parent 05772edbee
commit 05fa1338d8
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -102,12 +102,16 @@ if (PKG_CONFIG_FOUND)
endif() endif()
endif() endif()
# Optional: KWallet + KIO # Optional: KWallet, KIO, KCrash, KCoreAddons
set(KF5_MIN_VERSION "5.27.0") set(KF5_MIN_VERSION "5.27.0")
find_package(KF5Wallet ${KF5_MIN_VERSION} CONFIG) find_package(KF5Wallet ${KF5_MIN_VERSION} CONFIG)
set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL) set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG) find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG)
set_package_properties(KF5KIO PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL) set_package_properties(KF5KIO PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
find_package(KF5Crash ${KF5_MIN_VERSION} CONFIG)
set_package_properties(KF5Crash PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG)
set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
# Optional: PySide2 # Optional: PySide2
find_package(PySide2 "2.0.0") find_package(PySide2 "2.0.0")

2
src/plugins/CMakeLists.txt
View File

@ -13,7 +13,7 @@ if (GNOME_KEYRING_FOUND)
add_subdirectory(GnomeKeyringPasswords) add_subdirectory(GnomeKeyringPasswords)
endif() endif()
if (KF5Wallet_FOUND AND KF5KIO_FOUND) if (KF5Wallet_FOUND AND KF5KIO_FOUND AND KF5Crash_FOUND AND KF5CoreAddons_FOUND)
add_subdirectory(KDESupport) add_subdirectory(KDESupport)
endif() endif()

9
src/plugins/KDESupport/CMakeLists.txt
View File

@ -13,4 +13,11 @@ qt5_add_resources(RSCS ${KDESupport_RSCS})
add_library(KDESupport MODULE ${KDESupport_SRCS} ${RSCS}) add_library(KDESupport MODULE ${KDESupport_SRCS} ${RSCS})
install(TARGETS KDESupport DESTINATION ${FALKON_INSTALL_PLUGINDIR}) install(TARGETS KDESupport DESTINATION ${FALKON_INSTALL_PLUGINDIR})
target_link_libraries(KDESupport FalkonPrivate KF5::Wallet KF5::KIOCore KF5::KIOWidgets) target_link_libraries(KDESupport
FalkonPrivate
KF5::Wallet
KF5::KIOCore
KF5::KIOWidgets
KF5::Crash
KF5::CoreAddons
)

8
src/plugins/KDESupport/kdesupportplugin.cpp
View File

@ -27,6 +27,8 @@
#include "kioschemehandler.h" #include "kioschemehandler.h"
#include "webpage.h" #include "webpage.h"
#include <KCrash>
#include <KAboutData>
#include <KProtocolInfo> #include <KProtocolInfo>
#include <QWebEngineProfile> #include <QWebEngineProfile>
@ -60,6 +62,12 @@ void KDESupportPlugin::init(InitState state, const QString &settingsPath)
mApp->webProfile()->installUrlSchemeHandler(protocol.toUtf8(), handler); mApp->webProfile()->installUrlSchemeHandler(protocol.toUtf8(), handler);
WebPage::addSupportedScheme(protocol); WebPage::addSupportedScheme(protocol);
} }
KAboutData aboutData(QSL("falkon"), QSL("Falkon"), QCoreApplication::applicationVersion());
KAboutData::setApplicationData(aboutData);
KCrash::initialize();
KCrash::setFlags(KCrash::KeepFDs);
} }
void KDESupportPlugin::unload() void KDESupportPlugin::unload()