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

Fix compile on macOS

Browse Source 
...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:
Nikolai Kosjar
2016-11-02 11:17:37 +01:00
parent 77db31db3b
commit d93963296a
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.pro
View File

@@ -8,8 +8,6 @@ DESTDIR = $$IDE_APP_PATH
VERSION = $$QTCREATOR_VERSION VERSION = $$QTCREATOR_VERSION
QT -= testlib QT -= testlib
DEFINES += IDE_LIBEXEC_PATH=\\\"$$IDE_LIBEXEC_PATH\\\"
HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h
SOURCES += main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp SOURCES += main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp

1
src/app/app.qbs
View File

@@ -23,7 +23,6 @@ QtcProduct {
installDir: qtc.ide_bin_path installDir: qtc.ide_bin_path
property bool qtcRunnable: true property bool qtcRunnable: true
cpp.defines: base.concat(['IDE_LIBEXEC_PATH="' + qtc.ide_libexec_path + '"'])
cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"]
: ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"] : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"]
cpp.includePaths: [ cpp.includePaths: [

5
src/app/main.cpp
View File

@@ -327,8 +327,9 @@ int main(int argc, char **argv)
const int threadCount = QThreadPool::globalInstance()->maxThreadCount(); const int threadCount = QThreadPool::globalInstance()->maxThreadCount();
QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount)); QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount));
// Display a backtrace once a serious signal is delivered. // Display a backtrace once a serious signal is delivered (Linux only).
CrashHandlerSetup setupCrashHandler(IDE_LIBEXEC_PATH); const QString libexecPath = QCoreApplication::applicationDirPath() + "/../libexec/qtcreator";
CrashHandlerSetup setupCrashHandler(appNameC, CrashHandlerSetup::EnableRestart, libexecPath);
#ifdef ENABLE_QT_BREAKPAD #ifdef ENABLE_QT_BREAKPAD
QtSystemExceptionHandler systemExceptionHandler; QtSystemExceptionHandler systemExceptionHandler;