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

[Alexandre Janniaux]

Ok for me then, but can you provide a more complete commit
message for other contributors (like future me actually) ?

It also makes sense for the future, when Qt would have
splitted the xcb plugin from the core. But maybe it is not
the correct define to check X11 support as you check Qt
support to avoid VLC fields to be used. You might want a
HAVE_X11-like feature ifdef instead maybe?

Regards,
--
Alexandre Janniaux
Videolabs

On Mon, Nov 25, 2019 at 05:50:46PM +0100, Steve Lhomme wrote:
> On 2019-11-25 17:08, Alexandre Janniaux wrote:
> > Hi,
> >
> > I don't really understand the need for this patch, can you
> > provide details for it? I though that the Xcb was always
> > included in QtCore.
>
> Because I may change this x11 thing and I don't see a reason why my windows
> build fails when X11 code is changed.
>
> > Regards,
> > --
> > Alexandre Janniaux
> > Videolabs
> >
> > On Mon, Nov 25, 2019 at 05:01:09PM +0100, Steve Lhomme wrote:
> > > ---
> > >   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
> > >           case VOUT_WINDOW_TYPE_HWND:
> > >               p_wnd->handle.hwnd = (void *)stable->winId();
> > >               break;
> > > --
> > > 2.17.1
> > >
> > > _______________________________________________
> > > vlc-devel mailing list
> > > To unsubscribe or modify your subscription options:
> > > https://mailman.videolan.org/listinfo/vlc-devel
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> >
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel