vlc | branch: master | Thomas Guillem <[email protected]> | Mon Apr 15 11:53:21 2019 +0200| [397e4f2a5208f2cb6e7beeacbad1d555e78fea37] | committer: Thomas Guillem
qt: put back b_hasWayland initialization Regression from e1c82853965d44b4390af78d9184bd0b60ccc3fb This was inadvertently removed during rebase/merge. Fixes #22188 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=397e4f2a5208f2cb6e7beeacbad1d555e78fea37 --- modules/gui/qt/main_interface.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp index 7f135f93ba..5ff186f05b 100644 --- a/modules/gui/qt/main_interface.cpp +++ b/modules/gui/qt/main_interface.cpp @@ -170,6 +170,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ), QString platformName = QGuiApplication::platformName(); +#ifdef QT5_HAS_WAYLAND + b_hasWayland = platformName.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive); +#endif + // TODO: handle Wayland/X11/Win32 windows m_videoRenderer.reset(new QVoutWindowDummy(this)); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
