vlc | branch: master | Marvin Scholz <[email protected]> | Sun Nov 26 05:08:21 2017 +0100| [ddaa013e4295588d1024229c94ce5eff7f20f1f2] | committer: Marvin Scholz
qt: Remove macOS special case for icon 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ddaa013e4295588d1024229c94ce5eff7f20f1f2 --- 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 7976172afb..96b1224ff7 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -556,13 +556,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 ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
