[vlc-commits] commit: Qt: Do not use the xpm window icon on Mac, it's ugly ( Juho Vähä-Herttua )

[git at videolan.org]

vlc | branch: master | Juho Vähä-Herttua <juhovh at iki.fi> | Fri Jul 30 15:43:54 2010 +0300| [c1e1d93849589ebba7bbca2918f12d816854760f] | committer: Jean-Baptiste Kempf 

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

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1e1d93849589ebba7bbca2918f12d816854760f
---

 modules/gui/qt4/qt4.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index d689c4a..5965c05 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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 );