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

List:       kde-commits
Subject:    [ksirk/frameworks] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 11:50:27
Message-ID: E1aOOcF-0001EF-3l () scm ! kde ! org
[Download RAW message or body]

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

Use KCrash.

M  +17   -13   CMakeLists.txt
M  +22   -21   ksirk/CMakeLists.txt
M  +2    -1    ksirk/main.cpp

http://commits.kde.org/ksirk/7e7bd8f49aa8150c8d4f9c817d016725c57bae40

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47e04ea..f3c82dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,34 @@
 project(ksirk)
 cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 set (QT_MIN_VERSION "5.2.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
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+    Completion
     Config
-    WidgetsAddons
+    ConfigWidgets
+    CoreAddons
+    Crash
     DBusAddons
     Declarative
-    I18n
+    DocTools
     GuiAddons
-    ConfigWidgets
-    ItemViews
+    I18n
     IconThemes
-    DocTools
-    Completion
-    TextWidgets
-    XmlGui
-    KIO
+    ItemViews
     KDELibs4Support
-    Wallet
+    KIO
+    NewStuff
     NotifyConfig
-    NewStuff)
+    TextWidgets
+    Wallet
+    WidgetsAddons
+    XmlGui
+)
 =

 find_package(KF5KDEGames 4.9.0 REQUIRED)
 find_package(Phonon4Qt5 REQUIRED)
@@ -51,4 +54,5 @@ remove_definitions(-DQT_NO_STL)
 add_subdirectory(ksirk)
 add_subdirectory(ksirkskineditor)
 add_subdirectory(doc)
+
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_=
PACKAGES)
diff --git a/ksirk/CMakeLists.txt b/ksirk/CMakeLists.txt
index 4f2eae3..773d07d 100644
--- a/ksirk/CMakeLists.txt
+++ b/ksirk/CMakeLists.txt
@@ -2,9 +2,9 @@ include(CheckIncludeFiles)
 check_include_files(sys/stropts.h SYS_STROPTS_H_FOUND)
 configure_file(config-ksirk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksi=
rk.h)
 =

-add_subdirectory( skins )
-add_subdirectory( iris )
-add_subdirectory( icons )
+add_subdirectory(skins)
+add_subdirectory(iris)
+add_subdirectory(icons)
 =

 # FIND_PACKAGE(ZLIB REQUIRED)
 =

@@ -29,7 +29,7 @@ include_directories(
 #   ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/
   )
 =

-link_directories( ${CMAKE_CURRENT_BINARY_DIR}/iris/ )
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/iris/)
 =

 ########### next target ###############
 =

@@ -114,25 +114,26 @@ kconfig_add_kcfg_files( ksirk_SRCS ksirksettings.kcfg=
c )
 add_executable(ksirk ${ksirk_SRCS})
 =

 target_link_libraries(ksirk
-  Qt5::Xml
-  Qt5::Svg =

-  KF5::KIOCore =

-  Phonon::phonon4qt5
-  KF5::NewStuff
-  qca-qt5
-  iris_ksirk
-  KF5KDEGames
-  KF5KDEGamesPrivate
-  KF5::KDELibs4Support
-  KF5::Wallet
-  )
+    Qt5::Xml
+    Qt5::Svg
+    qca-qt5
+    iris_ksirk
+    KF5::Crash
+    KF5::KDELibs4Support
+    KF5::KIOCore
+    KF5::NewStuff
+    KF5::Wallet
+    Phonon::phonon4qt5
+    KF5KDEGames
+    KF5KDEGamesPrivate
+)
 =

 install( TARGETS ksirk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 =

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

-install( FILES ksirksettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
-install( PROGRAMS org.kde.ksirk.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-install( FILES ksirkui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/ksirk )
-install( FILES jabber.png  DESTINATION  ${KDE_INSTALL_DATADIR}/ksirk )
-install( FILES ksirk.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
+install(FILES ksirksettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install(PROGRAMS org.kde.ksirk.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ksirkui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/ksirk)
+install(FILES jabber.png  DESTINATION  ${KDE_INSTALL_DATADIR}/ksirk)
+install(FILES ksirk.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR})
diff --git a/ksirk/main.cpp b/ksirk/main.cpp
index 48cd75d..a24f50f 100644
--- a/ksirk/main.cpp
+++ b/ksirk/main.cpp
@@ -21,6 +21,7 @@ This is the standard main function of a KDE application s=
implified for KsirK
 #include "kgamewin.h"
 #include "GameLogic/gameautomaton.h"
 #include <KAboutData>
+#include <KCrash>
 #include <QDebug>
 #include <QApplication>
 #include <QCommandLineParser>
@@ -55,7 +56,7 @@ int main(int argc, char *argv[])
 =

   app.setWindowIcon(QIcon::fromTheme(QStringLiteral("ksirk")));
   KAboutData::setApplicationData(aboutData);
-
+  KCrash::initialize();
   QCommandLineParser parser;
   parser.addVersionOption();
   parser.addHelpOption();
[prev in list] [next in list] [prev in thread] [next in thread]