git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41ba5da
)
Qt4: compile fix.
author
Jean-Baptiste Kempf
<jb@videolan.org>
Wed, 15 Oct 2008 08:30:04 +0000
(10:30 +0200)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Wed, 15 Oct 2008 08:30:04 +0000
(10:30 +0200)
modules/gui/qt4/qt4.cpp
patch
|
blob
|
history
diff --git
a/modules/gui/qt4/qt4.cpp
b/modules/gui/qt4/qt4.cpp
index
39d58d8
..
ac00b62
100755
(executable)
--- 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 );