forked from qt-creator/qt-creator
Fix compile on macOS
...by not passing in IDE_LIBEXEC_PATH. While at it, fix the call to CrashHandlerSetup. Change-Id: Ie4018bf58f286c121bb85951546c4fe4d31e9959 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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: [
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user