Skip to content

V
vlc-2-2
Commit 78e989ef authored by Ludovic Fauvet's avatar Ludovic Fauvet
Browse files
Options

Qt: fallback on the high-resolution icons instead of the xpm

parent a7d3284e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/gui/qt4/qt4.cpp
View file @ 78e989ef
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
#include <vlc_xlib.h> #include <vlc_xlib.h>
#endif #endif
#include "../../../share/icons/32x32/vlc.xpm"
#include "../../../share/icons/32x32/vlc-xmas.xpm"
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_vout_window.h> #include <vlc_vout_window.h>
...@@ -469,9 +467,9 @@ static void *Thread( void *obj ) ...@@ -469,9 +467,9 @@ static void *Thread( void *obj )
/* Icon setting, Mac uses icon from .icns */ /* Icon setting, Mac uses icon from .icns */
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) ) if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon(vlc_xmas_xpm) ) ); app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon( ":/logo/vlc128-xmas.png" ) ) );
else else
app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon(vlc_xpm) ) ); app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) ) );
#endif #endif
/* Initialize timers and the Dialog Provider */ /* 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