From 73b431a91a98723f1037b1ecbdff191fc7175bfe Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 3 Feb 2011 21:47:42 +0100
Subject: [PATCH] QmlDesigner.NodeInstances: Add breakpad to qmlpuppet

---
 src/tools/qmlpuppet/main.cpp      | 8 ++++++++
 src/tools/qmlpuppet/qmlpuppet.pro | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/src/tools/qmlpuppet/main.cpp b/src/tools/qmlpuppet/main.cpp
index 69aec408e31..74dd5c9fe01 100644
--- a/src/tools/qmlpuppet/main.cpp
+++ b/src/tools/qmlpuppet/main.cpp
@@ -38,6 +38,10 @@
 
 #include <nodeinstanceclientproxy.h>
 
+#ifdef ENABLE_QT_BREAKPAD
+#include <qtsystemexceptionhandler.h>
+#endif
+
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
@@ -49,6 +53,10 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("nokia.com");
     QCoreApplication::setApplicationName("QmlPuppet");
 
+#ifdef ENABLE_QT_BREAKPAD
+    QtSystemExceptionHandler systemExceptionHandler;
+#endif
+
     new QmlDesigner::NodeInstanceClientProxy(&application);
 
     return application.exec();
diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro
index 5c6997c3b92..b4edaf1f3f2 100644
--- a/src/tools/qmlpuppet/qmlpuppet.pro
+++ b/src/tools/qmlpuppet/qmlpuppet.pro
@@ -14,6 +14,12 @@ include(../../rpath.pri)
 include (../../plugins/qmldesigner/designercore/instances/instances.pri)
 include (../../plugins/qmldesigner/designercore/exceptions/exceptions.pri)
 
+
+QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
+!isEmpty(QT_BREAKPAD_ROOT_PATH) {
+    include($$QT_BREAKPAD_ROOT_PATH/qtbreakpad.pri)
+}
+
 SOURCES += main.cpp
 RESOURCES += qmlpuppet.qrc