Skip to content

V
vlc-1.1
Commit e3db7651 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4: compile fix.

parent 41ba5dad
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
modules/gui/qt4/qt4.cpp
View file @ e3db7651
...@@ -264,11 +264,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -264,11 +264,7 @@ static int Open( vlc_object_t *p_this )
/* Access to the playlist */ /* Access to the playlist */
p_intf->p_sys->p_playlist = pl_Hold( p_intf ); p_intf->p_sys->p_playlist = pl_Hold( p_intf );
/* Listen to the messages */ /* Listen to the messages */
<<<<<<< Updated upstream:modules/gui/qt4/qt4.cpp
//p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL ); //p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, NULL, NULL );
=======
//p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
>>>>>>> Stashed changes:modules/gui/qt4/qt4.cpp
/* one settings to rule them all */ /* one settings to rule them all */
var_Create( p_this, "window_widget", VLC_VAR_ADDRESS ); var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
......
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