mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 16:32:33 +02:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5b4d1609b4
@ -17,7 +17,8 @@ elseif(APPLE)
|
||||
set(VCPKG_ARCH "x64-osx")
|
||||
endif()
|
||||
|
||||
# assume built-in pthreads on MacOS https://stackoverflow.com/questions/54587052/cmake-on-mac-could-not-find-threads-missing-threads-found
|
||||
# Assume built-in pthreads on MacOS
|
||||
# https://stackoverflow.com/questions/54587052/cmake-on-mac-could-not-find-threads-missing-threads-found
|
||||
if(APPLE)
|
||||
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||
set(CMAKE_HAVE_THREADS_LIBRARY 1)
|
||||
|
@ -232,7 +232,11 @@ bool App::loadSteamPlugin()
|
||||
{
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
#ifdef QT_NO_DEBUG
|
||||
const QString fileSuffix = ".dylib";
|
||||
#else
|
||||
const QString fileSuffix = "d.dylib";
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
@ -250,7 +254,7 @@ bool App::loadSteamPlugin()
|
||||
m_workshopPlugin.setFileName(QApplication::applicationDirPath() + "/ScreenPlayWorkshop" + fileSuffix);
|
||||
|
||||
if (!m_workshopPlugin.load()) {
|
||||
qWarning() << "Steam plugin not provided!";
|
||||
qWarning() << "Steam plugin not provided!" << QApplication::applicationDirPath() + "/ScreenPlayWorkshop" + fileSuffix;
|
||||
qWarning() << m_workshopPlugin.fileName() << " - With error: " << m_workshopPlugin.errorString();
|
||||
return false;
|
||||
}
|
||||
|
@ -236,6 +236,7 @@ void Util::logToGui(QtMsgType type, const QMessageLogContext& context, const QSt
|
||||
if (utilPointer != nullptr)
|
||||
utilPointer->appendDebugMessages(log);
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
sentry_value_t crumb
|
||||
= sentry_value_new_breadcrumb("default", qUtf8Printable(msg));
|
||||
|
||||
@ -253,6 +254,7 @@ void Util::logToGui(QtMsgType type, const QMessageLogContext& context, const QSt
|
||||
sentry_value_set_by_key(crumb, "data", location);
|
||||
|
||||
sentry_add_breadcrumb(crumb);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*!
|
||||
|
Loading…
Reference in New Issue
Block a user