[vlc-commits] qt: clean up X11 ifdef's

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 29 19:56:29 2016 +0200| [3dd26a14e64c09b3f7f57f809349e25de23c1d3a] | committer: Rémi Denis-Courmont

qt: clean up X11 ifdef's

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

 modules/gui/qt/components/interface_widgets.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 256d99d..0441687 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -50,11 +50,7 @@
 #include <QBitmap>
 #include <QUrl>
 
-#ifdef QT5_HAS_X11
-# define Q_WS_X11
-#endif
-
-#ifdef Q_WS_X11
+#if defined (QT5_HAS_X11) || defined (Q_WS_X11)
 #   include <X11/Xlib.h>
 #   include <qx11info_x11.h>
 #endif
@@ -92,7 +88,7 @@ VideoWidget::~VideoWidget()
 
 void VideoWidget::sync( void )
 {
-#ifdef Q_WS_X11
+#if defined (QT5_HAS_X11) || defined (Q_WS_X11)
     /* Make sure the X server has processed all requests.
      * This protects other threads using distinct connections from getting
      * the video widget window in an inconsistent states. */