[vlc-commits] Qt: favor X11 over Wayland
Rémi Denis-Courmont
git at videolan.org
Mon Dec 18 17:29:15 CET 2017
vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 18 18:19:08 2017 +0200| [a484e57ea90a07116628621aa070df0cc686ac2f] | committer: Rémi Denis-Courmont
Qt: favor X11 over Wayland
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a484e57ea90a07116628621aa070df0cc686ac2f
---
modules/gui/qt/qt.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index c4c32f3f31..cbd197750a 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -408,16 +408,16 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )
intf_thread_t *p_intf = (intf_thread_t *)p_this;
void *(*thread)(void *) = Thread;
-#ifdef QT5_HAS_WAYLAND
- if( HasWayland() )
- thread = ThreadWayland;
- else
-#endif
#ifdef QT5_HAS_X11
if( HasX11( p_this ) )
thread = ThreadXCB;
else
#endif
+#ifdef QT5_HAS_WAYLAND
+ if( HasWayland() )
+ thread = ThreadWayland;
+ else
+#endif
#if defined (QT5_HAS_X11) || defined (QT5_HAS_WAYLAND)
return VLC_EGENERIC;
#endif
More information about the vlc-commits
mailing list