From ec3ee9e964f33f5aebafc45663244d05a8331b48 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 8 Apr 2021 20:00:28 +1000 Subject: [PATCH] fix symbol discovery on macOS --- app/dialog/crashhandler/crashhandler.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/dialog/crashhandler/crashhandler.cpp b/app/dialog/crashhandler/crashhandler.cpp index 3f31748de..ee2a36877 100644 --- a/app/dialog/crashhandler/crashhandler.cpp +++ b/app/dialog/crashhandler/crashhandler.cpp @@ -233,11 +233,17 @@ void CrashHandlerDialog::SendErrorReport() // Find symbol file QDir symbol_dir(GetSymbolPath()); -#ifdef Q_OS_WINDOWS - symbol_dir = QDir(symbol_dir.filePath(QStringLiteral("olive-editor.pdb"))); + + QString symbol_bin_name; +#if defined(OS_WIN) + symbol_bin_name = QStringLiteral("olive-editor.pdb"); +#elif defined(OS_APPLE) + symbol_bin_name = QStringLiteral("Olive"); #else - symbol_dir = QDir(symbol_dir.filePath(QStringLiteral("olive-editor"))); + symbol_bin_name = QStringLiteral("olive-editor"); #endif + symbol_dir = QDir(symbol_dir.filePath(symbol_bin_name)); + QStringList folders_in_symbol_path = symbol_dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); if (folders_in_symbol_path.size() > 0) { @@ -250,7 +256,12 @@ void CrashHandlerDialog::SendErrorReport() } // Create sym section - QString symbol_filename = QStringLiteral("olive-editor.sym"); + QString symbol_filename +#if defined(OS_APPLE) + symbol_filename = QStringLiteral("Olive.sym"); +#else + symbol_filename = QStringLiteral("olive-editor.sym"); +#endif QString symbol_full_path = symbol_dir.filePath(symbol_filename); QHttpPart sym_part; sym_part.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/octet-stream"));