[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: rename `TableViewDelegate.qml` to `TableViewDelegateExt.qml`

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
31760684 by Fatih Uzunoglu at 2025-03-09T14:22:22+00:00
qml: rename `TableViewDelegate.qml` to `TableViewDelegateExt.qml`

Qt 6.9 introduces `TableViewDelegate` in Qt Quick Controls, this
causes name conflict here as the import is not explicitly stated
when resolving `TableViewDelegate` in `TableViewExt.qml` currently.

Alternatively the name can be kept, and `Widgets.TableViewDelegate`
can be used to specify which `TableViewDelegate` to use, but this
is probably safer than that approach.

- - - - -
332d3bab by Fatih Uzunoglu at 2025-03-09T14:22:22+00:00
po: update POTFILES with a new file

It seems that `TableViewDelegate` was forgotten to be
added here.

- - - - -


5 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/meson.build
- modules/gui/qt/widgets/qml/TableViewDelegate.qml → modules/gui/qt/widgets/qml/TableViewDelegateExt.qml
- modules/gui/qt/widgets/qml/TableViewExt.qml
- po/POTFILES.in


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -1255,7 +1255,7 @@ libqml_module_widgets_a_QML = \
 	widgets/qml/ImageToolButton.qml \
 	widgets/qml/ListViewExt.qml \
 	widgets/qml/TableViewExt.qml \
-	widgets/qml/TableViewDelegate.qml \
+	widgets/qml/TableViewDelegateExt.qml \
 	widgets/qml/TableRowDelegate.qml \
 	widgets/qml/TableHeaderDelegate.qml \
 	widgets/qml/DefaultShadow.qml \


=====================================
modules/gui/qt/meson.build
=====================================
@@ -852,7 +852,7 @@ qml_modules += {
         'widgets/qml/ImageToolButton.qml',
         'widgets/qml/ListViewExt.qml',
         'widgets/qml/TableViewExt.qml',
-        'widgets/qml/TableViewDelegate.qml',
+        'widgets/qml/TableViewDelegateExt.qml',
         'widgets/qml/TableRowDelegate.qml',
         'widgets/qml/TableHeaderDelegate.qml',
         'widgets/qml/DefaultShadow.qml',


=====================================
modules/gui/qt/widgets/qml/TableViewDelegate.qml → modules/gui/qt/widgets/qml/TableViewDelegateExt.qml
=====================================


=====================================
modules/gui/qt/widgets/qml/TableViewExt.qml
=====================================
@@ -408,7 +408,7 @@ FocusScope {
             color: root.colorContext.accent
         }
 
-        delegate: TableViewDelegate {
+        delegate: Widgets.TableViewDelegateExt {
             id: tableDelegate
 
             required property var model


=====================================
po/POTFILES.in
=====================================
@@ -910,6 +910,7 @@ modules/gui/qt/widgets/qml/SearchBox.qml
 modules/gui/qt/widgets/qml/SortControl.qml
 modules/gui/qt/widgets/qml/TableColumns.qml
 modules/gui/qt/widgets/qml/ViewHeader.qml
+modules/gui/qt/widgets/qml/TableViewDelegateExt.qml
 modules/gui/skins2/commands/async_queue.cpp
 modules/gui/skins2/commands/async_queue.hpp
 modules/gui/skins2/commands/cmd_add_item.cpp



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c880691c53084ea85d010be2232a52fed85835ca...332d3babe28668437914f2fca7f92496da1c4a7d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c880691c53084ea85d010be2232a52fed85835ca...332d3babe28668437914f2fca7f92496da1c4a7d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance