[vlc-commits] Qt: use explicit constructor for the xpm

Ludovic Fauvet git at videolan.org
Fri Jul 19 12:53:25 CEST 2013


vlc/vlc-2.1 | branch: master | Ludovic Fauvet <etix at videolan.org> | Mon Jul 15 11:38:11 2013 +0200| [008dd48c6c7db4ee25535344979bec96b2411c00] | committer: Jean-Baptiste Kempf

Qt: use explicit constructor for the xpm

(cherry picked from commit a6020fcc9ab2781daf1727aa220ca9f8215388fc)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=008dd48c6c7db4ee25535344979bec96b2411c00
---

 modules/gui/qt4/components/playlist/playlist_model.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 4a72025..932a4b0 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -64,7 +64,7 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
 
     /* Icons initialization */
 #define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( x )
-    ADD_ICON( UNKNOWN , type_unknown_xpm );
+    ADD_ICON( UNKNOWN , QPixmap( type_unknown_xpm ) );
     ADD_ICON( FILE, ":/type/file" );
     ADD_ICON( DIRECTORY, ":/type/directory" );
     ADD_ICON( DISC, ":/type/disc" );



More information about the vlc-commits mailing list