From 30c2634e722bf590a22fc26c57a594251d1712df Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu Date: Thu, 11 Jan 2024 20:40:43 +0200 Subject: [PATCH] qt: remove org.videolan.compat module --- modules/gui/qt/Makefile.am | 4 --- .../dialogs/toolbar/qml/EditorDNDDelegate.qml | 3 +-- .../qt/dialogs/toolbar/qml/EditorDNDView.qml | 5 ++-- modules/gui/qt/maininterface/mainui.cpp | 25 ------------------- .../qt/maininterface/qml/BannerSources.qml | 3 +-- .../gui/qt/maininterface/qml/MainDisplay.qml | 1 - .../qt/maininterface/qml/MainInterface.qml | 7 +++--- modules/gui/qt/player/qml/ControlBar.qml | 1 - modules/gui/qt/player/qml/ControlLayout.qml | 5 ++-- modules/gui/qt/player/qml/ControlRepeater.qml | 3 +-- modules/gui/qt/player/qml/MiniPlayer.qml | 3 +-- modules/gui/qt/player/qml/Player.qml | 7 +++--- .../gui/qt/player/qml/PlayerControlLayout.qml | 3 +-- .../controlbarcontrols/ArtworkInfoWidget.qml | 3 +-- .../gui/qt/playlist/qml/PlaylistDelegate.qml | 1 - .../gui/qt/playlist/qml/PlaylistListView.qml | 9 +++---- modules/gui/qt/style/AcrylicController.qml | 3 +-- modules/gui/qt/util/qml/BindingRev14.qml | 25 ------------------- modules/gui/qt/util/qml/BindingRev8.qml | 25 ------------------- modules/gui/qt/util/qml/ListViewRev11.qml | 24 ------------------ modules/gui/qt/util/qml/ListViewRev15.qml | 24 ------------------ modules/gui/qt/vlc.qrc | 4 --- modules/gui/qt/widgets/qml/FadingEdge.qml | 2 -- .../qt/widgets/qml/FadingEdgeForListView.qml | 6 ++--- modules/gui/qt/widgets/qml/GridItem.qml | 1 - modules/gui/qt/widgets/qml/ScaledImage.qml | 3 +-- .../gui/qt/widgets/qml/TableViewDelegate.qml | 1 - 27 files changed, 24 insertions(+), 177 deletions(-) delete mode 100644 modules/gui/qt/util/qml/BindingRev14.qml delete mode 100644 modules/gui/qt/util/qml/BindingRev8.qml delete mode 100644 modules/gui/qt/util/qml/ListViewRev11.qml delete mode 100644 modules/gui/qt/util/qml/ListViewRev15.qml diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index ee2e69abb4..e4b6c6cd33 100644 --- a/modules/gui/qt/Makefile.am +++ b/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 \ diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml index 13c4426672..783cdf3e34 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml +++ b/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 diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml index fd9893e99b..7f6943cf44 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml +++ b/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 diff --git a/modules/gui/qt/maininterface/mainui.cpp b/modules/gui/qt/maininterface/mainui.cpp index 45190ea547..786a3c1990 100644 --- a/modules/gui/qt/maininterface/mainui.cpp +++ b/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 diff --git a/modules/gui/qt/maininterface/qml/BannerSources.qml b/modules/gui/qt/maininterface/qml/BannerSources.qml index 119c906d76..229668189f 100644 --- a/modules/gui/qt/maininterface/qml/BannerSources.qml +++ b/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 diff --git a/modules/gui/qt/maininterface/qml/MainDisplay.qml b/modules/gui/qt/maininterface/qml/MainDisplay.qml index e75f33cc5d..e9c540677e 100644 --- a/modules/gui/qt/maininterface/qml/MainDisplay.qml +++ b/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 diff --git a/modules/gui/qt/maininterface/qml/MainInterface.qml b/modules/gui/qt/maininterface/qml/MainInterface.qml index 02ee5dbf02..86b03ae822 100644 --- a/modules/gui/qt/maininterface/qml/MainInterface.qml +++ b/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 diff --git a/modules/gui/qt/player/qml/ControlBar.qml b/modules/gui/qt/player/qml/ControlBar.qml index 5efa11af0d..d77f8b4279 100644 --- a/modules/gui/qt/player/qml/ControlBar.qml +++ b/modules/gui/qt/player/qml/ControlBar.qml @@ -23,7 +23,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:///style/" import "qrc:///widgets/" as Widgets diff --git a/modules/gui/qt/player/qml/ControlLayout.qml b/modules/gui/qt/player/qml/ControlLayout.qml index 814cf21f6e..603456b263 100644 --- a/modules/gui/qt/player/qml/ControlLayout.qml +++ b/modules/gui/qt/player/qml/ControlLayout.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:///style/" import "qrc:///widgets/" as Widgets @@ -38,7 +37,7 @@ FocusScope { // The wise thing to do would be to not // delay if the sizes are ready. - BindingCompat on Layout.minimumWidth { + Binding on Layout.minimumWidth { delayed: true when: controlLayout._componentCompleted value: { @@ -62,7 +61,7 @@ FocusScope { } } - BindingCompat on Layout.maximumWidth { + Binding on Layout.maximumWidth { delayed: true when: controlLayout._componentCompleted value: { diff --git a/modules/gui/qt/player/qml/ControlRepeater.qml b/modules/gui/qt/player/qml/ControlRepeater.qml index e8567be7b1..3720f24905 100644 --- a/modules/gui/qt/player/qml/ControlRepeater.qml +++ b/modules/gui/qt/player/qml/ControlRepeater.qml @@ -20,7 +20,6 @@ import QtQuick.Layouts 1.12 import QtQuick.Controls 2.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 Repeater { id: repeater @@ -64,7 +63,7 @@ Repeater { Layout.alignment: repeater.alignment - BindingCompat on visible { + Binding on visible { delayed: true // this is important value: (loader.x + loader.Layout.minimumWidth <= repeater.availableWidth) } diff --git a/modules/gui/qt/player/qml/MiniPlayer.qml b/modules/gui/qt/player/qml/MiniPlayer.qml index 2d4e3b5856..3e06c5e4fd 100644 --- a/modules/gui/qt/player/qml/MiniPlayer.qml +++ b/modules/gui/qt/player/qml/MiniPlayer.qml @@ -18,7 +18,6 @@ import QtQuick 2.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 import "qrc:///style/" @@ -54,7 +53,7 @@ ControlBar { } } - BindingCompat on _delayedImplicitHeight { + Binding on _delayedImplicitHeight { // eliminate intermediate adjustments until implicit height is calculated fully // we can not delay on component load because we do not want twitching // NOTE: The delay here can be removed, as long as a direct height is set diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml index 6cbaf02c97..dd5a434f09 100644 --- a/modules/gui/qt/player/qml/Player.qml +++ b/modules/gui/qt/player/qml/Player.qml @@ -23,7 +23,6 @@ import QtGraphicalEffects 1.12 import QtQuick.Window 2.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 import "qrc:///style/" import "qrc:///widgets/" as Widgets @@ -443,7 +442,7 @@ FocusScope { Layout.alignment: Qt.AlignHCenter Layout.topMargin: VLCStyle.margin_xxlarge - BindingCompat on visible { + Binding on visible { delayed: true when: albumLabel.componentCompleted value: centerContent.height > (albumLabel.y + albumLabel.height) @@ -468,7 +467,7 @@ FocusScope { Layout.alignment: Qt.AlignHCenter Layout.topMargin: VLCStyle.margin_small - BindingCompat on visible { + Binding on visible { delayed: true when: artistLabel.componentCompleted value: centerContent.height > (artistLabel.y + artistLabel.height) @@ -493,7 +492,7 @@ FocusScope { Layout.alignment: Qt.AlignHCenter Layout.topMargin: VLCStyle.margin_large - BindingCompat on visible { + Binding on visible { delayed: true when: audioControls.componentCompleted value: Player.videoTracks.count === 0 && centerContent.height > (audioControls.y + audioControls.height) diff --git a/modules/gui/qt/player/qml/PlayerControlLayout.qml b/modules/gui/qt/player/qml/PlayerControlLayout.qml index f669350bce..e3c96c509a 100644 --- a/modules/gui/qt/player/qml/PlayerControlLayout.qml +++ b/modules/gui/qt/player/qml/PlayerControlLayout.qml @@ -20,7 +20,6 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 import "qrc:///style/" import "qrc:///widgets/" as Widgets @@ -220,7 +219,7 @@ FocusScope { // TODO: "ControlListFilter"'s count...... active: !!playerControlLayout.model && !!playerControlLayout.model.center && (playerControlLayout.model.center.count > 0) - BindingCompat on width { + Binding on width { delayed: true when: loaderCenter._componentCompleted value: { diff --git a/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml index 1c205dbad3..d84b56e3f0 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml @@ -21,7 +21,6 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 import "qrc:///widgets/" as Widgets import "qrc:///style/" @@ -162,7 +161,7 @@ AbstractButton { Layout.fillWidth: true Layout.fillHeight: true - BindingCompat on visible { + Binding on visible { delayed: (MainCtx.qtVersion() < MainCtx.qtVersionCheck(5, 15, 8)) value: (infoColumn.height > infoColumn.implicitHeight) && (artistLabel.text.length > 0) } diff --git a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml index 81367483e7..4762af5863 100644 --- a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml +++ b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml @@ -23,7 +23,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:///widgets/" as Widgets import "qrc:///style/" diff --git a/modules/gui/qt/playlist/qml/PlaylistListView.qml b/modules/gui/qt/playlist/qml/PlaylistListView.qml index 6439bb7466..8fa4306437 100644 --- a/modules/gui/qt/playlist/qml/PlaylistListView.qml +++ b/modules/gui/qt/playlist/qml/PlaylistListView.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:///widgets/" as Widgets import "qrc:///util" as Util @@ -256,12 +255,12 @@ T.Pane { model: root.model - BindingCompat on fadingEdge.enableBeginningFade { + Binding on fadingEdge.enableBeginningFade { when: (autoScroller.scrollingDirection === Util.ViewDragAutoScrollHandler.Direction.Backward) value: false } - BindingCompat on fadingEdge.enableEndFade { + Binding on fadingEdge.enableEndFade { when: (autoScroller.scrollingDirection === Util.ViewDragAutoScrollHandler.Direction.Forward) value: false } @@ -307,7 +306,7 @@ T.Pane { footer: Item { implicitWidth: parent.width - BindingCompat on implicitHeight { + Binding on implicitHeight { delayed: true value: Math.max(VLCStyle.icon_normal, listView.height - y) } @@ -472,7 +471,7 @@ T.Pane { opacity: (listView.activeFocus) ? 1.0 : 0.4 - BindingCompat on visible { + Binding on visible { delayed: true value: (listView.model.count === 0 && !listView.footerItem.firstItemIndicatorVisible) } diff --git a/modules/gui/qt/style/AcrylicController.qml b/modules/gui/qt/style/AcrylicController.qml index 373f7a583b..0604cd23d6 100644 --- a/modules/gui/qt/style/AcrylicController.qml +++ b/modules/gui/qt/style/AcrylicController.qml @@ -21,7 +21,6 @@ pragma Singleton import QtQuick 2.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 Item { id: root @@ -37,7 +36,7 @@ Item { } } - BindingCompat { + Binding { when: root.enabled target: MainCtx property: "acrylicActive" diff --git a/modules/gui/qt/util/qml/BindingRev14.qml b/modules/gui/qt/util/qml/BindingRev14.qml deleted file mode 100644 index 00785b9a6c..0000000000 --- a/modules/gui/qt/util/qml/BindingRev14.qml +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2022 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -import QtQuick 2.14 -import QtQml 2.14 - -Binding { - // Binding Revision 14 - restoreMode: Binding.RestoreBindingOrValue -} diff --git a/modules/gui/qt/util/qml/BindingRev8.qml b/modules/gui/qt/util/qml/BindingRev8.qml deleted file mode 100644 index 2d5df2dddb..0000000000 --- a/modules/gui/qt/util/qml/BindingRev8.qml +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2022 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -import QtQuick 2.8 -import QtQml 2.8 - -Binding { - // Binding Revision 8 - // Only restores previous value if it was a binding -} diff --git a/modules/gui/qt/util/qml/ListViewRev11.qml b/modules/gui/qt/util/qml/ListViewRev11.qml deleted file mode 100644 index dc3539655a..0000000000 --- a/modules/gui/qt/util/qml/ListViewRev11.qml +++ /dev/null @@ -1,24 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2023 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - - -import QtQuick 2.12 - -ListView { - -} diff --git a/modules/gui/qt/util/qml/ListViewRev15.qml b/modules/gui/qt/util/qml/ListViewRev15.qml deleted file mode 100644 index 42483c51de..0000000000 --- a/modules/gui/qt/util/qml/ListViewRev15.qml +++ /dev/null @@ -1,24 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2023 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - - -import QtQuick 2.15 - -ListView { - -} diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc index c76f1850e5..0b18a30395 100644 --- a/modules/gui/qt/vlc.qrc +++ b/modules/gui/qt/vlc.qrc @@ -73,12 +73,8 @@ util/qml/ModelSortSettingHandler.qml util/qml/FlickableScrollHandler.qml util/qml/ViewDragAutoScrollHandler.qml - util/qml/BindingRev8.qml - util/qml/BindingRev14.qml util/qml/NativeMenu.qml util/qml/MLContextMenu.qml - util/qml/ListViewRev15.qml - util/qml/ListViewRev11.qml util/qml/FSM.qml util/qml/FSMState.qml util/qml/FadeControllerStateGroup.qml diff --git a/modules/gui/qt/widgets/qml/FadingEdge.qml b/modules/gui/qt/widgets/qml/FadingEdge.qml index 910cafdbf8..040855685c 100644 --- a/modules/gui/qt/widgets/qml/FadingEdge.qml +++ b/modules/gui/qt/widgets/qml/FadingEdge.qml @@ -17,8 +17,6 @@ *****************************************************************************/ import QtQuick 2.12 -import org.videolan.compat 0.1 - import "qrc:///style/" import "qrc:///util/Helpers.js" as Helpers diff --git a/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml b/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml index 216f0a2bbf..fb62e23215 100644 --- a/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml +++ b/modules/gui/qt/widgets/qml/FadingEdgeForListView.qml @@ -17,8 +17,6 @@ *****************************************************************************/ import QtQuick 2.12 -import org.videolan.compat 0.1 - import "qrc:///style/" import "qrc:///util/Helpers.js" as Helpers @@ -109,12 +107,12 @@ FadingEdge { (!lastVisibleItem.activeFocus && !Helpers.get(lastVisibleItem, "hovered", true))) - BindingCompat on enableBeginningFade { + Binding on enableBeginningFade { when: !!listView.headerItem && (listView.headerPositioning !== ListView.InlineHeader) value: false } - BindingCompat on enableEndFade { + Binding on enableEndFade { when: !!listView.footerItem && (listView.footerPositioning !== ListView.InlineFooter) value: false } diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml index 90d397a6d1..5b87d3865f 100644 --- a/modules/gui/qt/widgets/qml/GridItem.qml +++ b/modules/gui/qt/widgets/qml/GridItem.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:///widgets/" as Widgets import "qrc:///util/Helpers.js" as Helpers diff --git a/modules/gui/qt/widgets/qml/ScaledImage.qml b/modules/gui/qt/widgets/qml/ScaledImage.qml index 75f8a6643a..687f8c4444 100644 --- a/modules/gui/qt/widgets/qml/ScaledImage.qml +++ b/modules/gui/qt/widgets/qml/ScaledImage.qml @@ -21,7 +21,6 @@ import QtQuick 2.12 import org.videolan.vlc 0.1 -import org.videolan.compat 0.1 Image { id: root @@ -35,7 +34,7 @@ Image { readonly property bool _smooth: true smooth: _smooth - BindingCompat on smooth { + Binding on smooth { when: root.disableSmoothWhenIntegerUpscaling && !((root.paintedWidth % root.implicitWidth) || (root.paintedHeight % root.implicitHeight)) value: false diff --git a/modules/gui/qt/widgets/qml/TableViewDelegate.qml b/modules/gui/qt/widgets/qml/TableViewDelegate.qml index 9d3f5e9a3b..8c5e2c1d14 100644 --- a/modules/gui/qt/widgets/qml/TableViewDelegate.qml +++ b/modules/gui/qt/widgets/qml/TableViewDelegate.qml @@ -20,7 +20,6 @@ import QtQuick 2.12 import QtQuick.Templates 2.12 as T import QtQuick.Layouts 1.12 -import org.videolan.compat 0.1 import org.videolan.vlc 0.1 import "qrc:///widgets/" as Widgets