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

Tristan Matthews git at videolan.org
Tue May 30 09:34:46 CEST 2017


vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Mon May 29 15:27:17 2017 -0400| [14f3fb9202afcbbe5e85fdea80e7e0d33d86773d] | committer: Hugo Beauzée-Luyssen

qt: fix build when QT5_HAS_XCB but !QT5_HAS_X11

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=14f3fb9202afcbbe5e85fdea80e7e0d33d86773d
---

 modules/gui/qt/components/interface_widgets.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 0f3dd29848..7ca12a1efe 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -262,7 +262,8 @@ void VideoWidget::setSize( unsigned int w, unsigned int h )
 
 bool VideoWidget::nativeEvent( const QByteArray& eventType, void* message, long* )
 {
-#if defined(QT5_HAS_XCB)
+#if defined(QT5_HAS_X11)
+# if defined(QT5_HAS_XCB)
     if ( eventType == "xcb_generic_event_t" )
     {
         const xcb_generic_event_t* xev = static_cast<const xcb_generic_event_t*>( message );
@@ -270,6 +271,7 @@ bool VideoWidget::nativeEvent( const QByteArray& eventType, void* message, long*
         if ( xev->response_type == XCB_CONFIGURE_NOTIFY )
             reportSize();
     }
+# endif
 #endif
 #ifdef _WIN32
     if ( eventType == "windows_generic_MSG" )



More information about the vlc-commits mailing list