From e3db765137abde9ae995e532fa86dda512e59644 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 15 Oct 2008 10:30:04 +0200 Subject: [PATCH] Qt4: compile fix. --- modules/gui/qt4/qt4.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 39d58d865e..ac00b62d8f 100755 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -264,11 +264,7 @@ static int Open( vlc_object_t *p_this ) /* Access to the playlist */ p_intf->p_sys->p_playlist = pl_Hold( p_intf ); /* 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 ); ->>>>>>> Stashed changes:modules/gui/qt4/qt4.cpp /* one settings to rule them all */ var_Create( p_this, "window_widget", VLC_VAR_ADDRESS ); -- 2.39.2