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

List:       kde-commits
Subject:    [kubrick/frameworks] /: Use KCrash.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 12:19:17
Message-ID: E1aOP49-0002yQ-Je () scm ! kde ! org
[Download RAW message or body]

Git commit 2aa4c1340ad8413a133426b83ab4b893b69dfdb7 by Frederik Schwarzer.
Committed on 27/01/2016 at 12:19.
Pushed by schwarzer into branch 'frameworks'.

Use KCrash.

M  +14   -11   CMakeLists.txt
M  +31   -22   src/CMakeLists.txt
M  +7    -6    src/main.cpp

http://commits.kde.org/kubrick/2aa4c1340ad8413a133426b83ab4b893b69dfdb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a16e498..3c38705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,24 +2,26 @@ project (kubrick)
 
 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_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg OpenGL)
-find_package(KF5 REQUIRED COMPONENTS 
-    CoreAddons
-    Config
-    ItemModels
-    WidgetsAddons
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
+    ConfigWidgets
+    CoreAddons
+    Crash
     DBusAddons
     I18n
-    ConfigWidgets
-    XmlGui
+    ItemModels
+    KDELibs4Support
     KIO
     NotifyConfig
-    KDELibs4Support)
+    WidgetsAddons
+    XmlGui
+)
 
 find_package(KF5KDEGames 4.9.0 REQUIRED)
 
@@ -33,8 +35,9 @@ include(KDEInstallDirs)
 include(KDECompilerSettings)
 include(KDECMakeSettings)
 
-add_subdirectory (src)
-add_subdirectory (data)
-add_subdirectory (themes)
+add_subdirectory(src)
+add_subdirectory(data)
+add_subdirectory(themes)
 add_subdirectory(doc)
+
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 41ebdb3..c1e4a71 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,16 +4,17 @@
 include_directories( ${OPENGL_INCLUDE_DIR} )
 
 set(kubrick_SRCS 
-   kubrick_debug.cpp
-   main.cpp 
-   kubrick.cpp 
-   game.cpp 
-   cube.cpp
-   movetracker.cpp 
-   quaternion.cpp
-   gamedialog.cpp 
-   gameglview.cpp
-   scenelabel.cpp )
+    kubrick_debug.cpp
+    main.cpp 
+    kubrick.cpp 
+    game.cpp 
+    cube.cpp
+    movetracker.cpp 
+    quaternion.cpp
+    gamedialog.cpp 
+    gameglview.cpp
+    scenelabel.cpp
+)
 
 file(GLOB ICONS_SRCS "*-apps-kubrick.png")
 ecm_add_app_icon(kubrick_SRCS ICONS ${ICONS_SRCS})
@@ -24,13 +25,14 @@ if(WIN32)
 endif(WIN32)
 
 target_link_libraries(kubrick
-  Qt5::OpenGL
-  Qt5::Svg
-  KF5::KDELibs4Support
-  KF5::KIOCore
-  KF5KDEGames
-  ${OPENGL_gl_LIBRARY}
-  ${OPENGL_glu_LIBRARY}
+    Qt5::OpenGL
+    Qt5::Svg
+    KF5::Crash
+    KF5::KDELibs4Support
+    KF5::KIOCore
+    KF5KDEGames
+    ${OPENGL_gl_LIBRARY}
+    ${OPENGL_glu_LIBRARY}
 )
 
 install(TARGETS kubrick ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
@@ -38,9 +40,16 @@ install(TARGETS kubrick ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
-install( FILES  kubrickui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kubrick )
-install( PROGRAMS  org.kde.kubrick.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-
-ecm_install_icons(ICONS 128-apps-kubrick.png  16-apps-kubrick.png  \
22-apps-kubrick.png  32-apps-kubrick.png  48-apps-kubrick.png  64-apps-kubrick.png \
                DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
-
+install(FILES  kubrickui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kubrick)
+install(PROGRAMS  org.kde.kubrick.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+
+ecm_install_icons(ICONS
+    128-apps-kubrick.png
+    16-apps-kubrick.png
+    22-apps-kubrick.png
+    32-apps-kubrick.png
+    48-apps-kubrick.png
+    64-apps-kubrick.png
+    DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor
+)
 
diff --git a/src/main.cpp b/src/main.cpp
index e6c5a72..c1572ef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 
 
 #include <KAboutData>
-
+#include <KCrash>
 #include <QApplication>
 #include <KLocalizedString>
 #include <QCommandLineParser>
@@ -34,11 +34,11 @@ static const char version [] = "1.0";
 int main(int argc, char **argv)
 {
     KAboutData about ("kubrick", i18n ("Kubrick"),
-		      version, i18n (description),
-		      KAboutLicense::GPL,
-		      i18n ("(C) 2008 Ian Wadham"),
-				"http://kde.org/applications/games/kubrick/" );
-    about.addAuthor  (i18n ("Ian Wadham"), i18n ("Author"),
+            version, i18n (description),
+            KAboutLicense::GPL,
+            i18n ("(C) 2008 Ian Wadham"),
+            "http://kde.org/applications/games/kubrick/" );
+    about.addAuthor (i18n ("Ian Wadham"), i18n ("Author"),
                              "iandw.au@gmail.com");
 
     QApplication app(argc, argv);
@@ -52,6 +52,7 @@ int main(int argc, char **argv)
 
     QCommandLineParser parser;
     KAboutData::setApplicationData(about);
+    KCrash::initialize();
     parser.addVersionOption();
     parser.addHelpOption();
     about.setupCommandLine(&parser);


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