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

main: Add Frameworks to library paths for macOS

Browse Source
This commit is contained in:
Jonas Kvinge
2022-09-02 00:20:26 +02:00
parent ba4e1afefe
commit 59a261a5be
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@@ -192,9 +192,20 @@ int main(int argc, char *argv[]) {
QGuiApplication::setWindowIcon(IconLoader::Load("strawberry")); QGuiApplication::setWindowIcon(IconLoader::Load("strawberry"));
#if defined(USE_BUNDLE) && (defined(Q_OS_LINUX) || defined(Q_OS_MACOS)) #if defined(USE_BUNDLE)
qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR; {
QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR); QStringList library_paths;
#ifdef Q_OS_MACOS
library_paths.append(QCoreApplication::applicationDirPath() + "/../Frameworks");
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
library_paths.append(QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR);
#endif
if (!library_paths.isEmpty()) {
qLog(Debug) << "Looking for resources in" << library_paths;
QCoreApplication::setLibraryPaths(library_paths);
}
}
#endif #endif
// Gnome on Ubuntu has menu icons disabled by default. I think that's a bad idea, and makes some menus in Strawberry look confusing. // Gnome on Ubuntu has menu icons disabled by default. I think that's a bad idea, and makes some menus in Strawberry look confusing.