Commit d7f11468 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

qt: remove support for Qt4 with X11 or QPA

parent 0cae9432
......@@ -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 );
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment