[vlc-commits] [Git][videolan/vlc][master] 5 commits: qml: fix missing import in `ComboBoxExt`
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Wed Oct 14 09:59:23 UTC 2026
Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
815081ca by Fatih Uzunoglu at 2026-10-14T11:00:33+02:00
qml: fix missing import in `ComboBoxExt`
We don't rely on `QtQuick.Templates` because
we don't have substitute for `ScrollIndicator`.
Amends fc710473.
- - - - -
e0badd40 by Fatih Uzunoglu at 2026-10-14T11:00:33+02:00
qml: fix missing import in `WindowDialog`
Amends fc710473.
- - - - -
2eb17b54 by Fatih Uzunoglu at 2026-10-14T11:00:33+02:00
qml: fix missing imports in tool bar editor dialog
Amends fc710473.
- - - - -
1a0c7ffe by Fatih Uzunoglu at 2026-10-14T11:00:33+02:00
qml: sanity check for `QtQuick.Controls.Basic` module at start
Amends fc710473.
- - - - -
fadfa02a by Fatih Uzunoglu at 2026-10-14T11:00:33+02:00
qml: use `QtQuick.Templates` for `ButtonGroup` in `PlaybackSpeed`
The `QtQuick.Controls` import was mistakenly removed
without making this adjustment.
Amends fc710473.
- - - - -
7 changed files:
- modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml
- modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml
- modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml
- modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml
- modules/gui/qt/maininterface/qml/MainInterface.qml
- modules/gui/qt/player/qml/PlaybackSpeed.qml
- modules/gui/qt/widgets/qml/ComboBoxExt.qml
Changes:
=====================================
modules/gui/qt/dialogs/dialogs/qml/WindowDialog.qml
=====================================
@@ -19,6 +19,7 @@
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
+import QtQuick.Controls.Basic
import VLC.MainInterface
import VLC.Widgets as Widgets
=====================================
modules/gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml
=====================================
@@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
import QtQuick
-
+import QtQuick.Templates as T
import VLC.Style
-Label {
+T.Label {
font.pixelSize: VLCStyle.icon_medium
font.family: VLCIcons.fontFamily
=====================================
modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml
=====================================
@@ -17,6 +17,7 @@
*****************************************************************************/
import QtQuick
import QtQuick.Layouts
+import QtQuick.Controls.Basic
import QtQml.Models
=====================================
modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorDialog.qml
=====================================
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
import QtQuick
+import QtQuick.Controls.Basic
import QtQuick.Templates as T
import QtQuick.Layouts
=====================================
modules/gui/qt/maininterface/qml/MainInterface.qml
=====================================
@@ -23,6 +23,7 @@ import QtQml
import QtQml.Models
import QtQuick
import QtQuick.Layouts
+import QtQuick.Controls.Basic
import QtQuick.Templates
import QtQuick.Window
=====================================
modules/gui/qt/player/qml/PlaybackSpeed.qml
=====================================
@@ -256,7 +256,7 @@ ColumnLayout {
rowSpacing: VLCStyle.margin_small
columnSpacing: VLCStyle.margin_small
- ButtonGroup {
+ T.ButtonGroup {
id: buttonGroup
onClicked: function(button /* : AbstractButton */) {
@@ -281,7 +281,7 @@ ColumnLayout {
padding: 0 // we use spacing instead of paddings here
- ButtonGroup.group: buttonGroup
+ T.ButtonGroup.group: buttonGroup
}
}
}
=====================================
modules/gui/qt/widgets/qml/ComboBoxExt.qml
=====================================
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
import QtQuick
+import QtQuick.Controls.Basic
import QtQuick.Templates as T
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/875b7ffb545a2082fde040601fd0ba4e8ce7a35f...fadfa02a1ac861d2ff6185fcc2bad2c3b0040fe3
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/875b7ffb545a2082fde040601fd0ba4e8ce7a35f...fadfa02a1ac861d2ff6185fcc2bad2c3b0040fe3
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list