[vlc-devel] [PATCH] qt: don't handle the X11 Window type if X11 is not supported

[Rémi Denis-Courmont]

Le maanantaina 25. marraskuuta 2019, 18.01.09 EET Steve Lhomme a écrit :
> ---
>  modules/gui/qt/components/interface_widgets.cpp | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/modules/gui/qt/components/interface_widgets.cpp
> b/modules/gui/qt/components/interface_widgets.cpp index
> 3105d5466eb..9f98673d6c7 100644
> --- a/modules/gui/qt/components/interface_widgets.cpp
> +++ b/modules/gui/qt/components/interface_widgets.cpp
> @@ -156,10 +156,12 @@ void VideoWidget::request( struct vout_window_t *p_wnd
> ) p_wnd->type = p_intf->p_sys->voutWindowType;
>      switch( p_wnd->type )
>      {
> +#if defined (QT5_HAS_X11)
>          case VOUT_WINDOW_TYPE_XID:
>              p_wnd->handle.xid = stable->winId();
>              p_wnd->display.x11 = NULL;
>              break;
> +#endif

I don't see the point, so long as winId() exists, and I don't suppose it can 
be removed in Qt5. QT5_HAS_X11 so far is only used where the compilation would 
fail without X11 extras.

Besides, this is less "questionable" than the next case. At least X11 is just 
a network protocol that can more or less work on any desktop OS.

>          case VOUT_WINDOW_TYPE_HWND:
>              p_wnd->handle.hwnd = (void *)stable->winId();
>              break;


-- 
Реми Дёни-Курмон
http://www.remlab.net/