Qt4: use --x11-display

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 6c55915d7b9de360265d49bb1648f0a158d98320..15a8f88822958f3c63fdb488219be7d18cc5bd45 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -260,9 +260,9 @@ static int Open( vlc_object_t *p_this )
     intf_sys_t *p_sys;
 
 #ifdef Q_WS_X11
-    /* Thanks for libqt4 calling exit() in QApplication::QApplication()
-     * instead of returning an error, we have to check the X11 display */
-    Display *p_display = XOpenDisplay( NULL );
+    char *psz_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+    Display *p_display = XOpenDisplay( psz_display );
+    free( psz_display );
     if( !p_display )
     {
         msg_Err( p_intf, "Could not connect to X server" );