modules/gui/qt/Makefile.am

@@ -1025,14 +1025,10 @@ libqt_plugin_la_QML = \
 	util/qml/ModelSortSettingHandler.qml \
 	util/qml/FlickableScrollHandler.qml \
 	util/qml/ViewDragAutoScrollHandler.qml \
-	util/qml/BindingRev8.qml \
-	util/qml/BindingRev14.qml \
 	util/qml/FSM.qml \
 	util/qml/FSMState.qml \
 	util/qml/NativeMenu.qml \
 	util/qml/MLContextMenu.qml \
-	util/qml/ListViewRev15.qml \
-	util/qml/ListViewRev11.qml \
 	util/qml/FadeControllerStateGroup.qml \
 	widgets/qml/ActionButtonOverlay.qml \
 	widgets/qml/ActionButtonPrimary.qml \

modules/gui/qt/dialogs/dialogs/dialogmodel.hpp

@@ -35,6 +35,10 @@
 #include "qt.hpp"
 #include "util/singleton.hpp"
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+Q_MOC_INCLUDE("maininterface/mainctx.hpp")
+#endif
+
 class DialogId
 {
     Q_GADGET

modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp

@@ -23,6 +23,10 @@
 #include <QVector>
 #include <array>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+Q_MOC_INCLUDE( "player/player_controlbar_model.hpp" )
+#endif
+
 class PlayerControlbarModel;
 
 class ControlbarProfile : public QObject

modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp

@@ -674,7 +674,12 @@ bool ControlbarProfileModel::reload()
         if (modelValue.isEmpty())
             continue;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         const auto val = modelValue.splitRef(SETTINGS_PROFILE_SEPARATOR);
+#else
+        QStringView modelValueStringView(modelValue);
+        const auto val = modelValueStringView.split(SETTINGS_PROFILE_SEPARATOR);
+#endif
         if (val.isEmpty())
             continue;
 

modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml

@@ -22,7 +22,6 @@ import QtQuick.Layouts 1.12
 import QtQml.Models 2.12
 
 import org.videolan.vlc 0.1
-import org.videolan.compat 0.1
 
 import "qrc:///player/"
 import "qrc:///widgets/" as Widgets
@@ -108,7 +107,7 @@ Control {
         }
     }
 
-    BindingCompat {
+    Binding {
         when: dragActive
         value: true
 

modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml

@@ -20,7 +20,6 @@ import QtQuick.Controls 2.12
 import QtQml.Models 2.12
 
 import org.videolan.vlc 0.1
-import org.videolan.compat 0.1
 
 import "qrc:///style/"
 import "qrc:///util/" as Util
@@ -118,7 +117,7 @@ ListView {
 
         implicitHeight: VLCStyle.icon_medium
 
-        BindingCompat on implicitWidth {
+        Binding on implicitWidth {
             delayed: true
             value: Math.max(implicitHeight, playerBtnDND.width - x)
         }
@@ -167,7 +166,7 @@ ListView {
         anchors.verticalCenter: parent ? parent.verticalCenter : undefined
         dndView: playerBtnDND
 
-        BindingCompat {
+        Binding {
             when: dropArea.containsDrag
             value: true
 

modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp

@@ -126,7 +126,11 @@ CompositorDCompositionAcrylicSurface::~CompositorDCompositionAcrylicSurface()
         DestroyWindow(m_dummyWindow);
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, qintptr *)
+#else
 bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &, void *message, long *)
+#endif
 {
     MSG* msg = static_cast<MSG*>( message );
 

modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp

@@ -175,7 +175,11 @@ public:
     ~CompositorDCompositionAcrylicSurface();
 
 protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
 
 private:
     bool init(ID3D11Device *device);

modules/gui/qt/maininterface/compositor_wayland.cpp

@@ -107,7 +107,6 @@ bool CompositorWayland::makeMainInterface(MainCtx* mainCtx)
     if (m_mainCtx->useClientSideDecoration())
         m_qmlView->setFlag(Qt::FramelessWindowHint);
     m_qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
-    m_qmlView->setClearBeforeRendering(true);
     m_qmlView->setColor(QColor(Qt::transparent));
 
     m_qmlView->show();

modules/gui/qt/maininterface/compositor_win7.cpp

@@ -25,8 +25,10 @@
 
 #include <vlc_window.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #define D3D11_NO_HELPERS  // avoid tons of warnings
 #include <d3d11.h>
+#endif
 
 #include <dwmapi.h>
 
@@ -55,6 +57,7 @@ CompositorWin7::~CompositorWin7()
 
 bool CompositorWin7::preInit(qt_intf_t *p_intf)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     //check whether D3DCompiler is available. whitout it Angle won't work
     QLibrary d3dCompilerDll;
     for (int i = 47; i > 41; --i)
@@ -94,6 +97,7 @@ bool CompositorWin7::preInit(qt_intf_t *p_intf)
         msg_Info(p_intf, "no D3D support, use software backend");
         QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
     }
+#endif
 
     return true;
 }
@@ -141,7 +145,6 @@ bool CompositorWin7::makeMainInterface(MainCtx* mainCtx)
 
     m_qmlView = std::make_unique<QQuickView>();
     m_qmlView->setResizeMode(QQuickView::SizeRootObjectToView);
-    m_qmlView->setClearBeforeRendering(true);
     m_qmlView->setColor(QColor(Qt::transparent));
 
     m_qmlView->installEventFilter(this);
@@ -284,7 +287,11 @@ Win7NativeEventFilter::Win7NativeEventFilter(QObject* parent)
 }
 
 //parse native events that are not reported by Qt
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, qintptr*)
+#else
 bool Win7NativeEventFilter::nativeEventFilter(const QByteArray&, void* message, long*)
+#endif
 {
     MSG * msg = static_cast<MSG*>( message );
 

modules/gui/qt/maininterface/compositor_win7.hpp

@@ -34,7 +34,11 @@ class Win7NativeEventFilter : public QObject, public QAbstractNativeEventFilter
 public:
     Win7NativeEventFilter( QObject* parent = nullptr );
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */);
+#else
     bool nativeEventFilter(const QByteArray &, void *message, long* /* result */);
+#endif
 signals:
     void windowStyleChanged();
 };

modules/gui/qt/maininterface/mainctx.hpp

@@ -42,6 +42,13 @@
 
 #include <atomic>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+Q_MOC_INCLUDE( "dialogs/toolbar/controlbar_profile_model.hpp" )
+Q_MOC_INCLUDE( "util/csdbuttonmodel.hpp" )
+Q_MOC_INCLUDE( "playlist/playlist_controller.hpp" )
+Q_MOC_INCLUDE( "maininterface/mainctx_submodels.hpp" )
+#endif
+
 class CSDButtonModel;
 class QSettings;
 class QCloseEvent;

modules/gui/qt/maininterface/mainctx_win32.cpp

@@ -246,7 +246,11 @@ public:
             return qRound(static_cast<qreal>(8) * window->devicePixelRatio());
     }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &, void *message, qintptr *result) override
+#else
     bool nativeEventFilter(const QByteArray &, void *message, long *result) override
+#endif
     {
         MSG* msg = static_cast<MSG*>( message );
 
@@ -665,7 +669,11 @@ void WinTaskbarWidget::createTaskBarButtons()
         changeThumbbarButtons( THEMIM->getPlayingState() );
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, qintptr* /* result */)
+#else
 bool WinTaskbarWidget::nativeEventFilter(const QByteArray &, void *message, long* /* result */)
+#endif
 {
     MSG * msg = static_cast<MSG*>( message );
     if (msg->hwnd != WinId(m_window))
@@ -905,7 +913,11 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev)
     return ret;
 }
 
-bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, qintptr *result)
+#else
+    bool InterfaceWindowHandlerWin32::nativeEventFilter(const QByteArray &, void *message, long *result)
+#endif
 {
     MSG* msg = static_cast<MSG*>( message );
 

modules/gui/qt/maininterface/mainctx_win32.hpp

@@ -36,7 +36,11 @@ public:
     virtual ~WinTaskbarWidget();
 
 private:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
     void createTaskBarButtons();
 
 private slots:
@@ -77,7 +81,11 @@ public:
     bool eventFilter(QObject*, QEvent* event) override;
 
 protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+#else
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
+#endif
 
 private:
 #if QT_CLIENT_SIDE_DECORATION_AVAILABLE

modules/gui/qt/maininterface/mainui.cpp

@@ -320,31 +320,6 @@ void MainUI::registerQMLTypes()
         qmlProtectModule(uri, versionMajor);
     }
 
-    {
-        const char* const uri = "org.videolan.compat";
-        const int versionMajor = 0;
-        const int versionMinor = 1;
-
-        qmlRegisterModule(uri, versionMajor, versionMinor);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-        qmlRegisterType(QUrl("qrc:///util/BindingRev14.qml"), uri, versionMajor, versionMinor, "BindingCompat");
-#else
-        qmlRegisterType(QUrl("qrc:///util/BindingRev8.qml"), uri, versionMajor, versionMinor, "BindingCompat");
-#endif
-
-        qmlRegisterType(QUrl(QStringLiteral(
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-                            "qrc:///util/ListViewRev15.qml"
-#else
-                            "qrc:///util/ListViewRev11.qml"
-#endif
-                            )),
-                        uri, versionMajor, versionMinor, "ListViewCompat");
-
-        qmlProtectModule(uri, versionMajor);
-    }
-
     {
         // Custom controls
 

modules/gui/qt/maininterface/qml/BannerSources.qml

@@ -25,7 +25,6 @@ import QtQml.Models 2.12
 import QtQuick.Window 2.12
 
 import org.videolan.vlc 0.1
-import org.videolan.compat 0.1
 
 import "qrc:///style/"
 import "qrc:///playlist/" as PL
@@ -69,7 +68,7 @@ T.ToolBar {
         colorSet: ColorContext.Window
     }
 
-    BindingCompat {
+    Binding {
         target: MainCtx.search
         property: "pattern"
         value: searchBox.searchPattern

modules/gui/qt/maininterface/qml/MainDisplay.qml

@@ -21,7 +21,6 @@ import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.12
 
 import org.videolan.vlc 0.1
-import org.videolan.compat 0.1
 
 import "qrc:///style/"
 import "qrc:///main/" as Main

modules/gui/qt/maininterface/qml/MainInterface.qml

@@ -23,7 +23,6 @@ import QtQuick.Window 2.12
 import QtGraphicalEffects 1.12
 
 import org.videolan.vlc 0.1
-import org.videolan.compat 0.1
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///style/"
@@ -91,19 +90,19 @@ Item {
         anchors.rightMargin: MainCtx.windowExtendedMargin
         anchors.bottomMargin: MainCtx.windowExtendedMargin
 
-        BindingCompat {
+        Binding {
             target: VLCStyle
             property: "appWidth"
             value: g_mainInterface.width
         }
 
-        BindingCompat {
+        Binding {
             target: VLCStyle
             property: "appHeight"
             value: g_mainInterface.height
         }
 
-        BindingCompat {
+        Binding {
             target: MainCtx
             property: "windowExtendedMargin"
             value: _extendedFrameVisible ? VLCStyle.dp(20, VLCStyle.scale) : 0

modules/gui/qt/maininterface/videosurface.cpp

@@ -312,9 +312,17 @@ void VideoSurface::keyPressEvent(QKeyEvent* event)
     event->ignore();
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 void VideoSurface::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
+#else
+void VideoSurface::geometryChange(const QRectF& newGeometry, const QRectF& oldGeometry)
+#endif
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
+#else
+    QQuickItem::geometryChange(newGeometry, oldGeometry);
+#endif
     onSurfaceSizeChanged();
 }
 

modules/gui/qt/maininterface/videosurface.hpp

@@ -30,6 +30,10 @@ extern "C" {
     typedef struct vlc_window vlc_window_t;
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+Q_MOC_INCLUDE( "maininterface/mainctx.hpp")
+#endif
+
 class MainCtx;
 
 class WindowResizer :
@@ -118,8 +122,13 @@ protected:
     void wheelEvent(QWheelEvent *event) override;
 #endif
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    void geometryChange(const QRectF &newGeometry,
+                        const QRectF &oldGeometry) override;
+#else
     void geometryChanged(const QRectF &newGeometry,
-                         const QRectF &oldGeometry) override;
+                        const QRectF &oldGeometry) override;
+#endif
 
     Qt::CursorShape getCursorShape() const;
     void setCursorShape(Qt::CursorShape);