Add breakpad

This is not activated if breakpad and qt-breakpad is not availiable.

4 files changed, 16 insertions, 1 deletions

diff --git a/src/app/app.pro b/src/app/app.pro
index cea4a3af60..f46135df84 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -9,6 +9,10 @@ SOURCES += main.cpp
 
 include(../rpath.pri)
 
+QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
+!isEmpty(QT_BREAKPAD_ROOT_PATH) {
+    include($$QT_BREAKPAD_ROOT_PATH/qtbreakpad.pri)
+}
 win32 {
     CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
     else:LIBS *= -lExtensionSystem -lAggregation
diff --git a/src/app/main.cpp b/src/app/main.cpp
index c08049f4c9..08abe59f0f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -49,6 +49,10 @@
 #include <QtGui/QApplication>
 #include <QtGui/QMainWindow>
 
+#ifdef ENABLE_QT_BREAKPAD
+#include <qtsystemexceptionhandler.h>
+#endif
+
 enum { OptionIndent = 4, DescriptionIndent = 24 };
 
 static const char *appNameC = "Qt Creator";
@@ -180,6 +184,10 @@ int main(int argc, char **argv)
 
     SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);
 
+#ifdef ENABLE_QT_BREAKPAD
+    QtSystemExceptionHandler systemExceptionHandler;
+#endif
+
     QTranslator translator;
     QTranslator qtTranslator;
     QString locale = QLocale::system().name();
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index b42033881b..1625bb13fa 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -46,7 +46,6 @@ contains(QT_CONFIG, declarative) {
 
     include(../private_headers.pri)
     exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
-        SUBDIRS += plugin_qmldesigner 
     } else {
         warning()
         warning("QmlDesigner plugin have been disabled")
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 375a6bf891..1c734cd264 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,3 +1,7 @@
 TEMPLATE = subdirs
 win32:SUBDIRS = qtcdebugger
 SUBDIRS += qml
+QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
+!isEmpty(QT_BREAKPAD_ROOT_PATH) {
+    SUBDIRS += qtcrashhandler
+}