[vlc-devel] [PATCH] qt: fix build when QT5_HAS_XCB but !QT5_HAS_X11

[Tristan Matthews]

On Wed, May 17, 2017 at 4:45 AM, Hugo Beauzée-Luyssen <hugo at beauzee.fr> wrote:
> On Tue, May 16, 2017, at 07:24 AM, Tristan Matthews wrote:
>> Fixes "error: ‘xcb_generic_event_t’ does not name a type", etc.
>>
>> ---
>>  modules/gui/qt/components/interface_widgets.cpp | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/modules/gui/qt/components/interface_widgets.cpp
>> b/modules/gui/qt/components/interface_widgets.cpp
>> index b3b9b28..9ddeba8 100644
>> --- a/modules/gui/qt/components/interface_widgets.cpp
>> +++ b/modules/gui/qt/components/interface_widgets.cpp
>> @@ -53,9 +53,9 @@
>>  #if defined (QT5_HAS_X11)
>>  # include <X11/Xlib.h>
>>  # include <QX11Info>
>> -# if defined(QT5_HAS_XCB)
>> -#  include <xcb/xproto.h>
>> -# endif
>> +#endif
>> +#if defined(QT5_HAS_XCB)
>> +# include <xcb/xproto.h>
>>  #endif
>>  #ifdef QT5_HAS_WAYLAND
>>  # include QPNI_HEADER
>> --
>> 2.7.4
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>
> Hi,
>
> Shouldn't it be the other way around? ie. Changing the check in
> VideoWidget::nativeEvent ?

I'm not that familiar either. Basically if you want QT5_HAS_XCB to
depend on QT5_HAS_X11, the latter check has to be added to nativeEvent
(even though no X11 symbols are used there). Otherwise, if they are
actually supposed to be independent, this patch would be the fix.

> I'll confess my lack of knowledge when it comes to x11/xcb/qt and will
> be used depending on the various configurations
>
> Regards,
>
> --
>   Hugo Beauzée-Luyssen
>   hugo at beauzee.fr
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel