[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konquest/frameworks] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 11:10:54
Message-ID: E1aONzy-0002ug-Bh () scm ! kde ! org
[Download RAW message or body]

Git commit a1be33aa4d9eab26908f41cda8099b056a9bcacd by Frederik Schwarzer.
Committed on 27/01/2016 at 11:10.
Pushed by schwarzer into branch 'frameworks'.

Use KCrash.

M  +33   -18   CMakeLists.txt
M  +2    -0    Konquest.cc

http://commits.kde.org/konquest/a1be33aa4d9eab26908f41cda8099b056a9bcacd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e7bbcf..eede6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,27 +2,29 @@ project(konquest)
 =

 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 set (QT_MIN_VERSION "5.3.0")
+set (KF5_MIN_VERSION "5.15.0")
 =

 find_package(ECM 1.7.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MO=
DULE_DIR})
 =

 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Q=
ml Quick QuickWidgets Svg Test)
-find_package(KF5 REQUIRED COMPONENTS =

-    CoreAddons
-    Config
-    ItemModels
-    WidgetsAddons
-    WindowSystem
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
+    ConfigWidgets
+    CoreAddons
+    Crash
     DBusAddons
     I18n
-    ConfigWidgets
-    TextWidgets
-    XmlGui
+    ItemModels
+    KDELibs4Support
     KIO
-    NotifyConfig
     NewStuff
-    KDELibs4Support)
+    NotifyConfig
+    TextWidgets
+    WidgetsAddons
+    WindowSystem
+    XmlGui
+)
 =

 find_package(KF5KDEGames 4.9.0 REQUIRED)
 find_package(Phonon4Qt5 CONFIG REQUIRED)
@@ -101,17 +103,30 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-a=
pps-konquest.png")
 ecm_add_app_icon(konquest_SRCS ICONS ${ICONS_SRCS})
 add_executable(konquest ${konquest_SRCS})
 =

-target_link_libraries(konquest   KF5KDEGames KF5::KDELibs4Support Qt5::Svg=
 KF5::DBusAddons)
+target_link_libraries(konquest
+    Qt5::Svg
+    KF5::Crash
+    KF5::DBusAddons
+    KF5::KDELibs4Support
+    KF5KDEGames
+)
 =

-install(TARGETS konquest  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS konquest  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 =

 =

 ########### install files ###############
 =

-install( PROGRAMS org.kde.konquest.desktop  DESTINATION  ${KDE_INSTALL_APP=
DIR} )
-install( FILES konquestui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/konq=
uest )
-
-ecm_install_icons( ICONS 128-apps-konquest.png  16-apps-konquest.png  22-a=
pps-konquest.png  32-apps-konquest.png  48-apps-konquest.png  64-apps-konqu=
est.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
-
+install(PROGRAMS org.kde.konquest.desktop  DESTINATION  ${KDE_INSTALL_APPD=
IR})
+install(FILES konquestui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/konqu=
est)
+
+ecm_install_icons(ICONS
+    128-apps-konquest.png
+    16-apps-konquest.png
+    22-apps-konquest.png
+    32-apps-konquest.png
+    48-apps-konquest.png
+    64-apps-konquest.png
+    DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor
+)
 =

 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_=
PACKAGES)
diff --git a/Konquest.cc b/Konquest.cc
index ee7309f..2528eb7 100644
--- a/Konquest.cc
+++ b/Konquest.cc
@@ -23,6 +23,7 @@
 =

 #include <KLocalizedString>
 #include <KAboutData>
+#include <KCrash>
 #include <QApplication>
 #include <KLocalizedString>
 #include <QCommandLineParser>
@@ -56,6 +57,7 @@ main(int argc, char **argv)
 =

     QCommandLineParser parser;
     KAboutData::setApplicationData(aboutData);
+    KCrash::initialize();
     parser.addVersionOption();
     parser.addHelpOption();
     aboutData.setupCommandLine(&parser);
[prev in list] [next in list] [prev in thread] [next in thread]