]> git.sesse.net Git - vlc/commitdiff
Qt: Do not use the xpm window icon on Mac, it's ugly
authorJuho Vähä-Herttua <juhovh@iki.fi>
Fri, 30 Jul 2010 12:43:54 +0000 (15:43 +0300)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 30 Jul 2010 23:04:12 +0000 (01:04 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/gui/qt4/qt4.cpp

index d689c4afac1bee9ed661f77349580f1ed80a48d1..5965c05478a5401f71e0df5d3e87a90f52650ad4 100644 (file)
@@ -423,10 +423,12 @@ static void *Thread( void *obj )
             QSettings::UserScope, "vlc", "vlc-qt-interface" );
 
     /* Icon setting */
+#ifndef Q_WS_MAC
     if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
         app.setWindowIcon( QIcon(vlc_christmas_xpm) );
     else
         app.setWindowIcon( QIcon(vlc_xpm) );
+#endif
 
     /* Initialize timers and the Dialog Provider */
     DialogsProvider::getInstance( p_intf );