From f96e25e10831572d97daa6ed2d94144a5e9f1a83 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 31 Dec 2023 05:23:17 +0500 Subject: [PATCH] Don't set the application icon in qt_main.c on Mac Should fix it overriding the bundle's icon --- src/qt/qt_main.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index 02a0026d8..bc95ad1d1 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -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()) {