aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2016-11-14 12:28:51 +0100
committerOrgad Shaneh <orgads@gmail.com>2017-07-25 14:24:11 +0000
commit4beaae0f79ebe820fa9fdfdfb8195e5aeac89369 (patch)
tree3148e2c5032cfd79bed47787d0df97e0d9206f86 /share
parent131a796f9f0afe10e744f27071f426af26296458 (diff)
Introduce Breakpad crash handler
Google Breakpad (https://chromium.googlesource.com/breakpad/breakpad) is a widely used crash handler framework, e.g. by Mozilla and Chromium. It is providing a platform neutral solution to generate mini dumps, collect debug information and generate stack traces from those. Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com> Change-Id: I09382e7db0dc9e29b228e7b554fda7b6f5684349 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri5
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp3
2 files changed, 2 insertions, 6 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
index 5a10394f18..39599385a8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -13,11 +13,6 @@ include (../interfaces/interfaces.pri)
include (../types/types.pri)
include (../qmlprivategate/qmlprivategate.pri)
-QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
-!isEmpty(QT_BREAKPAD_ROOT_PATH) {
- include($$QT_BREAKPAD_ROOT_PATH/qtbreakpad.pri)
-}
-
SOURCES += $$PWD/qml2puppetmain.cpp
RESOURCES += $$PWD/../qmlpuppet.qrc
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
index 0d29b554e6..22460eaf6b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
@@ -111,7 +111,8 @@ int internalMain(QGuiApplication *application)
#ifdef ENABLE_QT_BREAKPAD
- QtSystemExceptionHandler systemExceptionHandler;
+ const QString libexecPath = QCoreApplication::applicationDirPath() + '/' + RELATIVE_LIBEXEC_PATH;
+ QtSystemExceptionHandler systemExceptionHandler(libexecPath);
#endif
new QmlDesigner::Qt5NodeInstanceClientProxy(application);