[vlc-commits] Qt: get window icon from theme (falling back to existing pixmap)

[Philip Sequeira]

vlc | branch: master | Philip Sequeira <phsequei at gmail.com> | Wed Jun 19 05:18:11 2013 -0400| [98ef0e14bc7c8015db0259778974a299763c4d43] | committer: Rémi Denis-Courmont

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

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 00283d7..f5f1ab8 100644
--- 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 */