flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update externals

Browse Source
This commit is contained in:
Roland Winklmeier
2017-01-20 02:12:14 +01:00
committed by Mathew Sutcliffe
parent 281d493434
commit c260af7b11
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: 1051e314bf...9746257055

9
src/blackcore/application.cpp
View File

@@ -1082,10 +1082,12 @@ namespace BlackCore
static const QString extension = CBuildConfig::isRunningOnWindowsNtPlatform() ? ".exe" : QString(); static const QString extension = CBuildConfig::isRunningOnWindowsNtPlatform() ? ".exe" : QString();
static const QString handler = CDirectoryUtils::applicationDirectoryPath() + "/" + "swift_crashpad_handler" + extension; static const QString handler = CDirectoryUtils::applicationDirectoryPath() + "/" + "swift_crashpad_handler" + extension;
static const QString database = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + static const QString crashpadPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
"/org.swift-project/" + "/org.swift-project/" +
CDirectoryUtils::normalizedApplicationDirectory() + CDirectoryUtils::normalizedApplicationDirectory() +
"/crashpad"; "/crashpad";
static const QString database = crashpadPath + "/database";
static const QString metrics = crashpadPath + "/metrics";
if (!QFileInfo::exists(handler)) if (!QFileInfo::exists(handler))
{ {
@@ -1104,9 +1106,8 @@ namespace BlackCore
auto settings = m_crashReportDatabase->GetSettings(); auto settings = m_crashReportDatabase->GetSettings();
settings->SetUploadsEnabled(CBuildConfig::isReleaseBuild() && m_crashDumpUploadEnabled.getThreadLocal()); settings->SetUploadsEnabled(CBuildConfig::isReleaseBuild() && m_crashDumpUploadEnabled.getThreadLocal());
m_crashpadClient = std::make_unique<CrashpadClient>(); m_crashpadClient = std::make_unique<CrashpadClient>();
m_crashpadClient->StartHandler(qstringToFilePath(handler), qstringToFilePath(database), m_crashpadClient->StartHandler(qstringToFilePath(handler), qstringToFilePath(database), qstringToFilePath(metrics),
serverUrl.getFullUrl().toStdString(), annotations, {}, false); serverUrl.getFullUrl().toStdString(), annotations, {}, false, true);
m_crashpadClient->UseHandler();
return CStatusMessage(this).info("Using crash handler"); return CStatusMessage(this).info("Using crash handler");
#else #else
return CStatusMessage(this).info("Not using crash handler"); return CStatusMessage(this).info("Not using crash handler");

4
src/blackcore/blackcore.pro
View File

@@ -41,8 +41,8 @@ DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin DLLDESTDIR = $$DestRoot/bin
msvc { msvc {
CONFIG(debug, debug|release): LIBS *= -lcrashpad_clientd -lcrashpad_utild -lbased -lRpcrt4 CONFIG(debug, debug|release): LIBS *= -lcrashpad_clientd -lcrashpad_utild -lbased -lRpcrt4 -lAdvapi32
CONFIG(release, debug|release): LIBS *= -lcrashpad_client -lcrashpad_util -lbase -lRpcrt4 CONFIG(release, debug|release): LIBS *= -lcrashpad_client -lcrashpad_util -lbase -lRpcrt4 -lAdvapi32
} }
macx: LIBS *= -lcrashpad_client -lcrashpad_util -lbase -lbsm -framework Security macx: LIBS *= -lcrashpad_client -lcrashpad_util -lbase -lbsm -framework Security