From 9fb9aaf6e4b6ead07ac680f0bf36bdb64e103fba Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 5 Nov 2015 12:35:37 +0100
Subject: [PATCH] Install CrashReporter handler.

---
 src/calamares/CMakeLists.txt          |  7 ++++++-
 src/calamares/main.cpp                | 11 +++++++++++
 src/libcalamares/CalamaresConfig.h.in |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index f02815af9..8e032d4e5 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -27,6 +27,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../libcalamares
 
+    ${THIRDPARTY_DIR}/libcrashreporter-qt/src/
+
     ../libcalamares
     ../libcalamaresui
 )
@@ -51,15 +53,18 @@ SET_TARGET_PROPERTIES(calamares_bin
         RUNTIME_OUTPUT_NAME calamares
 )
 
+if( WITH_CRASHREPORTER )
+    list( APPEND LINK_LIBRARIES ${LINK_LIBRARIES} pthread crashreporter-handler )
+endif()
 
 qt5_use_modules( calamares_bin Core Widgets )
 target_link_libraries( calamares_bin
-    ${LINK_LIBRARIES}
     ${CALAMARES_LIBRARIES}
     calamaresui
     Qt5::Core
     Qt5::Widgets
     yaml-cpp
+    ${LINK_LIBRARIES}
 )
 
 install( TARGETS calamares_bin
diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp
index bc27688f3..ec6c233a1 100644
--- a/src/calamares/main.cpp
+++ b/src/calamares/main.cpp
@@ -22,6 +22,10 @@
 #include "kdsingleapplicationguard/kdsingleapplicationguard.h"
 #include "utils/CalamaresUtils.h"
 #include "utils/Logger.h"
+#include "CalamaresConfig.h"
+#ifdef WITH_CRASHREPORTER
+    #include "libcrashreporter-handler/Handler.h"
+#endif
 
 #include <QCommandLineParser>
 #include <QDebug>
@@ -32,6 +36,13 @@ main( int argc, char* argv[] )
 {
     CalamaresApplication a( argc, argv );
 
+#ifdef WITH_CRASHREPORTER
+    CrashReporter::Handler* handler =
+            new CrashReporter::Handler( QDir::tempPath(),
+                                        true,
+                                        "calamares_crash_reporter" );
+#endif
+
     QCommandLineParser parser;
     parser.setApplicationDescription( "Distribution-independent installer framework" );
     parser.addHelpOption();
diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in
index 31cbc926d..94467ae74 100644
--- a/src/libcalamares/CalamaresConfig.h.in
+++ b/src/libcalamares/CalamaresConfig.h.in
@@ -10,5 +10,6 @@
 
 //cmakedefines for CMake variables (e.g. for optdepends) go here
 #cmakedefine WITH_PYTHON
+#cmakedefine WITH_CRASHREPORTER
 
 #endif // CALAMARESCONFIG_H