[vlc-commits] qt: remove support for Qt4 with X11 or QPA

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec  1 00:14:19 2016 +0200| [d7f11468dfc78dc9ffd371054bfffb1a3e8d5730] | committer: Rémi Denis-Courmont

qt: remove support for Qt4 with X11 or QPA

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

 modules/gui/qt/components/interface_widgets.cpp | 7 ++-----
 modules/gui/qt/qt.cpp                           | 8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 0fc598b..c7f4cd1 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -50,7 +50,7 @@
 #include <QBitmap>
 #include <QUrl>
 
-#if defined (QT5_HAS_X11) || defined (Q_WS_X11)
+#if defined (QT5_HAS_X11)
 # include <X11/Xlib.h>
 # include <QX11Info>
 #endif
@@ -95,9 +95,6 @@ void VideoWidget::sync( void )
     if( QX11Info::isPlatformX11() )
         XSync( QX11Info::display(), False );
 #endif
-#ifdef Q_WS_X11
-    XSync( QX11Info::display(), False );
-#endif
 }
 
 /**
@@ -134,7 +131,7 @@ WId VideoWidget::request( struct vout_window_t *p_wnd, unsigned int *pi_width,
        management */
     /* This is currently disabled on X11 as it does not seem to improve
      * performance, but causes the video widget to be transparent... */
-#if !defined (QT5_HAS_X11) && !defined (Q_WS_X11) && !defined (Q_WS_QPA)
+#if !defined (QT5_HAS_X11)
     stable->setAttribute( Qt::WA_PaintOnScreen, true );
 #else
     stable->setMouseTracking( true );
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 3af00c0..17c90e7 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -406,10 +406,6 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
 #if defined (QT5_HAS_X11) || defined (QT5_HAS_WAYLAND)
         return VLC_EGENERIC;
 #endif
-#ifdef Q_WS_X11
-    if( !HasX11( p_this ) )
-        return VLC_EGENERIC;
-#endif
 
     QMutexLocker locker (&lock);
     if (busy)
@@ -583,7 +579,7 @@ static void *ThreadPlatform( void *obj, char *platform_name )
 
         /* Check window type from the Qt platform back-end */
         p_sys->voutWindowType = VOUT_WINDOW_TYPE_INVALID;
-#if HAS_QT5 || defined (Q_WS_QPA)
+#if HAS_QT5
         QString platform = app.platformName();
         if( platform == qfu("xcb") )
             p_sys->voutWindowType = VOUT_WINDOW_TYPE_XID;
@@ -593,8 +589,6 @@ static void *ThreadPlatform( void *obj, char *platform_name )
             p_sys->voutWindowType = VOUT_WINDOW_TYPE_NSOBJECT;
         else
             msg_Err( p_intf, "unknown Qt platform: %s", qtu(platform) );
-#elif defined (Q_WS_X11)
-        p_sys->voutWindowType = VOUT_WINDOW_TYPE_XID;
 #elif defined (Q_WS_WIN) || defined (Q_WS_PM)
         p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND;
 #elif defined (Q_WS_MAC)