[vlc-commits] qt: remove unnecessary Qt 5.10.0 check

Fatih Uzunoglu git at videolan.org
Wed Feb 17 09:31:52 UTC 2021


vlc | branch: master | Fatih Uzunoglu <fuzun54 at outlook.com> | Fri Feb 12 00:23:38 2021 +0300| [b4b5ab6dcc4ebc8027bcec0a15910a112d0e205d] | committer: Pierre Lamot

qt: remove unnecessary Qt 5.10.0 check

Signed-off-by: Pierre Lamot <pierre at videolabs.io>

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

 modules/gui/qt/maininterface/main_interface.cpp | 4 ----
 modules/gui/qt/qt.hpp                           | 1 -
 2 files changed, 5 deletions(-)

diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp
index d59c6b6abc..bd350ac077 100644
--- a/modules/gui/qt/maininterface/main_interface.cpp
+++ b/modules/gui/qt/maininterface/main_interface.cpp
@@ -69,10 +69,6 @@
 #include <QFileInfo>
 #endif
 
-#if ! HAS_QT510 && defined(QT5_HAS_X11)
-# include <QX11Info>
-# include <X11/Xlib.h>
-#endif
 
 #include <QtGlobal>
 #include <QTimer>
diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp
index aadb8ac50a..a283a02e63 100644
--- a/modules/gui/qt/qt.hpp
+++ b/modules/gui/qt/qt.hpp
@@ -47,7 +47,6 @@
 # error Update your Qt version to at least 5.11.0
 #endif
 
-#define HAS_QT510 ( QT_VERSION >= 0x051000 )
 
 enum {
     IMEventTypeOffset     = 0,



More information about the vlc-commits mailing list