Qt: get window icon from theme (falling back to existing pixmap)

[vlc] / modules / gui / qt4 / qt4.cpp

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 00283d752de9deefa4471f1fb179729fe885c62a..f5f1ab847a217b636f7dd6dc81c161bf27ed5ed6 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -469,9 +469,9 @@ static void *Thread( void *obj )
     /* Icon setting, Mac uses icon from .icns */
 #ifndef Q_WS_MAC
     if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
-        app.setWindowIcon( QIcon(vlc_xmas_xpm) );
+        app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon(vlc_xmas_xpm) ) );
     else
-        app.setWindowIcon( QIcon(vlc_xpm) );
+        app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon(vlc_xpm) ) );
 #endif
 
     /* Initialize timers and the Dialog Provider */