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

Merge pull request #3973 from lemondrops/mac_icon_fix

Browse Source 
Don't set the application icon in qt_main.c on Mac
This commit is contained in:
Miran Grča
2023-12-31 01:42:20 +01:00
committed by GitHub
parent 0265b34384 f96e25e108
commit 33b6a32300
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qt/qt_main.cpp
View File

@@ -195,18 +195,19 @@ main(int argc, char *argv[])
SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
#endif
#ifdef RELEASE_BUILD
#ifndef Q_OS_APPLE
# ifdef RELEASE_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
#elif defined ALPHA_BUILD
# elif defined ALPHA_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
#elif defined BETA_BUILD
# elif defined BETA_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
#else
# else
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");
# endif
#endif
if (!pc_init_modules()) {