From c271e05abcfbc3762fb1f1d6a381fb5a3cd8171e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 4 Jan 2019 00:39:22 +0100 Subject: [PATCH] Use Q_OS_MACOS instead of Q_OS_DARWIN --- src/engine/gstengine.cpp | 4 ++-- src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index d7e946e15..32223bb38 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -425,7 +425,7 @@ void GstEngine::SetEnvironment() { // On Windows and macOS we bundle the gstreamer plugins with strawberry #ifdef USE_BUNDLE -#if defined(Q_OS_DARWIN) +#if defined(Q_OS_MACOS) scanner_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gst-plugin-scanner"; plugin_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gstreamer"; #elif defined(Q_OS_WIN32) @@ -449,7 +449,7 @@ void GstEngine::SetEnvironment() { Utilities::SetEnv("GST_REGISTRY", registry_filename); } -#if defined(Q_OS_DARWIN) && defined(USE_BUNDLE) +#if defined(Q_OS_MACOS) && defined(USE_BUNDLE) Utilities::SetEnv("GIO_EXTRA_MODULES", QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gio-modules"); #endif diff --git a/src/main.cpp b/src/main.cpp index e87119217..4f981e8cf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -162,7 +162,7 @@ int main(int argc, char* argv[]) { QtSingleApplication a(argc, argv); -#if defined(Q_OS_DARWIN) && defined(USE_BUNDLE) +#if defined(Q_OS_MACOS) && defined(USE_BUNDLE) qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR; QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR); #endif