dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Q_OS_MACOS instead of Q_OS_DARWIN

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-04 00:39:22 +01:00
parent de7154eda8
commit c271e05abc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/gstengine.cpp
View File

@@ -425,7 +425,7 @@ void GstEngine::SetEnvironment() {
// On Windows and macOS we bundle the gstreamer plugins with strawberry // On Windows and macOS we bundle the gstreamer plugins with strawberry
#ifdef USE_BUNDLE #ifdef USE_BUNDLE
#if defined(Q_OS_DARWIN) #if defined(Q_OS_MACOS)
scanner_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gst-plugin-scanner"; scanner_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gst-plugin-scanner";
plugin_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gstreamer"; plugin_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gstreamer";
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
@@ -449,7 +449,7 @@ void GstEngine::SetEnvironment() {
Utilities::SetEnv("GST_REGISTRY", registry_filename); 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"); Utilities::SetEnv("GIO_EXTRA_MODULES", QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gio-modules");
#endif #endif

2
src/main.cpp
View File

@@ -162,7 +162,7 @@ int main(int argc, char* argv[]) {
QtSingleApplication a(argc, 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; qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR); QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR);
#endif #endif