vlc | branch: master | Ludovic Fauvet <[email protected]> | Fri Jun 21 13:56:21 2013 +0200| [78e989efff5ecf472985fa607e939bb1530cd4be] | committer: Ludovic Fauvet
Qt: fallback on the high-resolution icons instead of the xpm > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=78e989efff5ecf472985fa607e939bb1530cd4be --- modules/gui/qt4/qt4.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index f5f1ab8..2492dd5 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -45,8 +45,6 @@ #include <vlc_xlib.h> #endif -#include "../../../share/icons/32x32/vlc.xpm" -#include "../../../share/icons/32x32/vlc-xmas.xpm" #include <vlc_plugin.h> #include <vlc_vout_window.h> @@ -469,9 +467,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::fromTheme( "vlc-xmas", QIcon(vlc_xmas_xpm) ) ); + app.setWindowIcon( QIcon::fromTheme( "vlc-xmas", QIcon( ":/logo/vlc128-xmas.png" ) ) ); else - app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon(vlc_xpm) ) ); + app.setWindowIcon( QIcon::fromTheme( "vlc", QIcon( ":/logo/vlc256.png" ) ) ); #endif /* Initialize timers and the Dialog Provider */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
