80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Don't set the application icon in qt_main.c on Mac

Browse Source 
Should fix it overriding the bundle's icon
This commit is contained in:
Alexander Babikov
2023-12-31 05:23:17 +05:00
parent 0265b34384
commit f96e25e108
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/qt_main.cpp
View File

@@ -195,6 +195,7 @@ main(int argc, char *argv[])
SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
#endif #endif
#ifndef Q_OS_APPLE
# ifdef RELEASE_BUILD # ifdef RELEASE_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico")); app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
# elif defined ALPHA_BUILD # elif defined ALPHA_BUILD
@@ -203,10 +204,10 @@ main(int argc, char *argv[])
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico")); app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
# else # else
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico")); app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
#endif
#if (!defined(Q_OS_WINDOWS) && !defined(__APPLE__)) # ifdef Q_OS_UNIX
app.setDesktopFileName("net.86box.86Box"); app.setDesktopFileName("net.86box.86Box");
# endif
#endif #endif
if (!pc_init_modules()) { if (!pc_init_modules()) {