vlc | branch: master | Pierre Lamot <[email protected]> | Wed Aug 28 16:38:33 2019 +0200| [74e6f8f8b83615e5f34a840ea6f6ebfbea94f85e] | committer: Jean-Baptiste Kempf
qml: don't load manually PlayerControlBarModel's model on creation model is loaded automatically > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=74e6f8f8b83615e5f34a840ea6f6ebfbea94f85e --- modules/gui/qt/qml/dialogs/ToolbarEditor.qml | 3 --- modules/gui/qt/qml/player/ControlBar.qml | 2 -- modules/gui/qt/qml/player/MiniPlayer.qml | 2 -- 3 files changed, 7 deletions(-) diff --git a/modules/gui/qt/qml/dialogs/ToolbarEditor.qml b/modules/gui/qt/qml/dialogs/ToolbarEditor.qml index 8f4552500e..00b871ed5a 100644 --- a/modules/gui/qt/qml/dialogs/ToolbarEditor.qml +++ b/modules/gui/qt/qml/dialogs/ToolbarEditor.qml @@ -128,15 +128,12 @@ Rectangle{ id: playerControlBarModel mainCtx: mainctx configName: "MainPlayerToolbar" - /* Load the model when mainctx is set */ - Component.onCompleted: reloadModel() } PlayerControlBarModel { id: miniPlayerModel mainCtx: mainctx configName: "MiniPlayerToolbar" - Component.onCompleted: reloadModel() } Player.ControlButtons{ diff --git a/modules/gui/qt/qml/player/ControlBar.qml b/modules/gui/qt/qml/player/ControlBar.qml index 9fe836c6a8..87d2e0ac12 100644 --- a/modules/gui/qt/qml/player/ControlBar.qml +++ b/modules/gui/qt/qml/player/ControlBar.qml @@ -136,8 +136,6 @@ Utils.NavigableFocusScope { id:playerControlBarModel mainCtx: mainctx configName: "MainPlayerToolbar" - /* Load the model when mainctx is set */ - Component.onCompleted: reloadModel() } ControlButtons{ diff --git a/modules/gui/qt/qml/player/MiniPlayer.qml b/modules/gui/qt/qml/player/MiniPlayer.qml index f3dbf7642c..7f83087377 100644 --- a/modules/gui/qt/qml/player/MiniPlayer.qml +++ b/modules/gui/qt/qml/player/MiniPlayer.qml @@ -155,8 +155,6 @@ Utils.NavigableFocusScope { id: miniPlayerModel mainCtx: mainctx configName: "MiniPlayerToolbar" - /* Load the model when mainctx is set */ - Component.onCompleted: reloadModel() } ControlButtons { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
