Skip to content

V
vlc-2-2
Commit c1e1d938 authored by Juho Vähä-Herttua's avatar Juho Vähä-Herttua Committed by Jean-Baptiste Kempf
Browse files
Options

Qt: Do not use the xpm window icon on Mac, it's ugly 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 07471c3c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/gui/qt4/qt4.cpp
View file @ c1e1d938
...@@ -423,10 +423,12 @@ static void *Thread( void *obj ) ...@@ -423,10 +423,12 @@ static void *Thread( void *obj )
QSettings::UserScope, "vlc", "vlc-qt-interface" ); QSettings::UserScope, "vlc", "vlc-qt-interface" );
/* Icon setting */ /* Icon setting */
#ifndef Q_WS_MAC
if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */ if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
app.setWindowIcon( QIcon(vlc_christmas_xpm) ); app.setWindowIcon( QIcon(vlc_christmas_xpm) );
else else
app.setWindowIcon( QIcon(vlc_xpm) ); app.setWindowIcon( QIcon(vlc_xpm) );
#endif
/* Initialize timers and the Dialog Provider */ /* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf ); DialogsProvider::getInstance( p_intf );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment