feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Use CrashHandler for clangbackend

Browse Source 
Change-Id: Ic51e9c3227744fa087ade4bde9a7b5f421024f6f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-10-25 12:30:43 +02:00
parent 9ac8572b29
commit e1921741af
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/clangbackend/clangbackend.pro
View File

@@ -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})

8
src/tools/clangbackend/clangbackend.qbs
View File

@@ -14,6 +14,14 @@ QtcTool {
]
}
Group {
prefix: "../qtcreatorcrashhandler/"
files: [
"crashhandlersetup.h",
"crashhandlersetup.cpp",
]
}
files: [ "clangbackendmain.cpp" ]
condition: libclang.present

6
src/tools/clangbackend/clangbackendmain.cpp
View File

@@ -23,6 +23,8 @@
**
****************************************************************************/
#include "../qtcreatorcrashhandler/crashhandlersetup.h"
#include <QCommandLineParser>
#include <QCoreApplication>
#include <QLoggingCategory>
@@ -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();