diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index 9d7aef915f1..f75775c8e78 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -14,6 +14,9 @@ INCLUDEPATH += $$LLVM_INCLUDEPATH SOURCES += clangbackendmain.cpp +HEADERS += ../qtcreatorcrashhandler/crashhandlersetup.h +SOURCES += ../qtcreatorcrashhandler/crashhandlersetup.cpp + unix { !osx: QMAKE_LFLAGS += -Wl,-z,origin !contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}):!disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs index 7f154f963d0..54c54550917 100644 --- a/src/tools/clangbackend/clangbackend.qbs +++ b/src/tools/clangbackend/clangbackend.qbs @@ -14,6 +14,14 @@ QtcTool { ] } + Group { + prefix: "../qtcreatorcrashhandler/" + files: [ + "crashhandlersetup.h", + "crashhandlersetup.cpp", + ] + } + files: [ "clangbackendmain.cpp" ] condition: libclang.present diff --git a/src/tools/clangbackend/clangbackendmain.cpp b/src/tools/clangbackend/clangbackendmain.cpp index 02014a3cf6e..33a824c3d2f 100644 --- a/src/tools/clangbackend/clangbackendmain.cpp +++ b/src/tools/clangbackend/clangbackendmain.cpp @@ -23,6 +23,8 @@ ** ****************************************************************************/ +#include "../qtcreatorcrashhandler/crashhandlersetup.h" + #include #include #include @@ -61,8 +63,10 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0")); QCoreApplication application(argc, argv); + CrashHandlerSetup setupCrashHandler(QCoreApplication::applicationName(), + CrashHandlerSetup::DisableRestart); - const QString connection = processArguments(application); + const QString connection = processArguments(application); clang_toggleCrashRecovery(true); clang_enableStackTraces();