Skip to content

V
vlc-1.1
Commit a80b4670 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Revert [24713]. If problem there is it's in configure.ac or in the qt4 .pc's

parent 2e436947
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
modules/gui/qt4/qt4.cpp
View file @ a80b4670
...@@ -210,7 +210,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -210,7 +210,6 @@ static int Open( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
p_intf->pf_run = Run; p_intf->pf_run = Run;
#if 0
#if defined Q_WS_X11 && defined HAVE_X11_XLIB_H #if defined Q_WS_X11 && defined HAVE_X11_XLIB_H
/* Thanks for libqt4 calling exit() in QApplication::QApplication() /* Thanks for libqt4 calling exit() in QApplication::QApplication()
* instead of returning an error, we have to check the X11 display */ * instead of returning an error, we have to check the X11 display */
...@@ -221,7 +220,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -221,7 +220,6 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
XCloseDisplay( p_display ); XCloseDisplay( p_display );
#endif
#endif #endif
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys ) if( !p_intf->p_sys )
......
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