diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp index 90b131f3139..77654975ad9 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.cpp @@ -127,8 +127,10 @@ void CrashHandlerDialog::setApplicationInfo(const QString &signalName) const QString title = tr("%1 has closed unexpectedly (Signal \"%2\")").arg(ideName, signalName); const QString introLabelContents = tr( "

%1.

" - "

Please file a bug report with the debug information provided below.

") - .arg(title, QLatin1String(URL_BUGTRACKER)); + "

Please file a bug report with the debug information provided below.

" + "

Hint: Deactivate this Crash Handler by adding QTC_NO_CRASH_HANDLER=1
" + "to the environment (evaluated on startup of %3).

") + .arg(title, QLatin1String(URL_BUGTRACKER), ideName); m_ui->introLabel->setText(introLabelContents); setWindowTitle(title); diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.ui b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.ui index 9a7b67a003b..6ebd87f26bb 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.ui +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.ui @@ -37,6 +37,9 @@ Some useful information here... + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp index 06748e43327..a9ced3867d1 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp +++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp @@ -83,6 +83,9 @@ extern "C" void signalHandler(int signal) void setupCrashHandler() { #ifdef BUILD_CRASH_HANDLER + if (!qgetenv("QTC_NO_CRASH_HANDLER").isEmpty()) + return; + const QString crashHandlerPath = qApp->applicationDirPath() + QLatin1String("/qtcreator_crash_handler"); crashHandlerPathC = qstrdup(qPrintable(crashHandlerPath));