Skip to content

V
vlc
Commit 98ef0e14 authored by Philip Sequeira's avatar Philip Sequeira Committed by Rémi Denis-Courmont
Browse files
Options

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

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 8463dd48
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/qt4/qt4.cpp
View file @ 98ef0e14
......@@ -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 */
......
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