[vlc-devel] [PATCH 4/4] qt: Remove macOS special case for icon

Marvin Scholz epirat07 at gmail.com
Sun Nov 26 05:42:32 CET 2017


While it is still true that on macOS, the icon from the app bundle is
used, this is not true for our pseudo-bundle. And I do not think it's
worth a special case anymore.
---
 modules/gui/qt/qt.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index abb54c647b..30e6a1d2cc 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -557,13 +557,10 @@ static void *ThreadPlatform( void *obj, char *platform_name )
 #endif
             QSettings::UserScope, "vlc", "vlc-qt-interface" );
 
-    /* Icon setting, Mac uses icon from .icns */
-#ifndef Q_OS_MAC
     if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
         app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon( ":/logo/vlc128-xmas.png" ) ) );
     else
         app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) ) );
-#endif
 
     /* Initialize the Dialog Provider and the Main Input Manager */
     DialogsProvider::getInstance( p_intf );
-- 
2.13.6 (Apple Git-96)



More information about the vlc-devel mailing list