diff options
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/app/app.qbs | 1 | ||||
| -rw-r--r-- | src/app/main.cpp | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index 2fa34de3e3..b86678ae16 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -8,8 +8,6 @@ DESTDIR = $$IDE_APP_PATH VERSION = $$QTCREATOR_VERSION QT -= testlib -DEFINES += IDE_LIBEXEC_PATH=\\\"$$IDE_LIBEXEC_PATH\\\" - HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h SOURCES += main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp diff --git a/src/app/app.qbs b/src/app/app.qbs index 4a00abe586..2eac52ac64 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -23,7 +23,6 @@ QtcProduct { installDir: qtc.ide_bin_path property bool qtcRunnable: true - cpp.defines: base.concat(['IDE_LIBEXEC_PATH="' + qtc.ide_libexec_path + '"']) cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"] cpp.includePaths: [ diff --git a/src/app/main.cpp b/src/app/main.cpp index 5600be6e97..85fe4e5e89 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -327,8 +327,9 @@ int main(int argc, char **argv) const int threadCount = QThreadPool::globalInstance()->maxThreadCount(); QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount)); - // Display a backtrace once a serious signal is delivered. - CrashHandlerSetup setupCrashHandler(IDE_LIBEXEC_PATH); + // Display a backtrace once a serious signal is delivered (Linux only). + const QString libexecPath = QCoreApplication::applicationDirPath() + "/../libexec/qtcreator"; + CrashHandlerSetup setupCrashHandler(appNameC, CrashHandlerSetup::EnableRestart, libexecPath); #ifdef ENABLE_QT_BREAKPAD QtSystemExceptionHandler systemExceptionHandler; |