[vlc-commits] qt: sort entries in Makefile.am

Pierre Lamot git at videolan.org
Tue Dec 17 15:37:54 CET 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Mon Dec  9 14:06:14 2019 +0100| [52e8541e0b2fc29abd5bdae6cfab0e6dd1201d8b] | committer: Jean-Baptiste Kempf

qt: sort entries in Makefile.am

  no functionnal changes

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52e8541e0b2fc29abd5bdae6cfab0e6dd1201d8b
---

 modules/gui/qt/Makefile.am | 484 ++++++++++++++++++++++-----------------------
 1 file changed, 242 insertions(+), 242 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 5e4722fd91..ae840e7a27 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -46,76 +46,10 @@ endif
 
 libqt_plugin_la_SOURCES = \
 	gui/qt/qt.cpp gui/qt/qt.hpp \
-	gui/qt/menus/menus.cpp gui/qt/menus/menus.hpp \
-	gui/qt/maininterface/main_interface.cpp gui/qt/maininterface/main_interface.hpp \
-	gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \
-	gui/qt/util/renderer_manager.cpp gui/qt/util/renderer_manager.hpp \
-	gui/qt/util/recents.cpp gui/qt/util/recents.hpp \
-	gui/qt/util/var_common_p.hpp \
-	gui/qt/util/variables.cpp gui/qt/util/variables.hpp \
-	gui/qt/util/varchoicemodel.cpp  gui/qt/util/varchoicemodel.hpp \
 	gui/qt/dialogs/bookmarks/bookmarks.cpp gui/qt/dialogs/bookmarks/bookmarks.hpp \
-	gui/qt/dialogs/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \
-	gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \
-	gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \
-	gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \
-	gui/qt/dialogs/messages/messages.cpp gui/qt/dialogs/messages/messages.hpp \
-	gui/qt/dialogs/errors/errors.cpp gui/qt/dialogs/errors/errors.hpp \
-	gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
-	gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
-	gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
-	gui/qt/dialogs/gototime/gototime.cpp gui/qt/dialogs/gototime/gototime.hpp \
-	gui/qt/dialogs/toolbar/toolbareditor.cpp gui/qt/dialogs/toolbar/toolbareditor.hpp \
-	gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
-	gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
-	gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
-	gui/qt/dialogs/firstrun/firstrun.cpp gui/qt/dialogs/firstrun/firstrun.hpp \
-	gui/qt/dialogs/podcast/podcast_configuration.cpp \
-	gui/qt/dialogs/podcast/podcast_configuration.hpp \
-	gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \
-	gui/qt/dialogs/extensions/extensions_manager.cpp gui/qt/dialogs/extensions/extensions_manager.hpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.cpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.hpp \
-	gui/qt/dialogs/fingerprint/chromaprint.cpp \
-	gui/qt/dialogs/fingerprint/chromaprint.hpp \
-	gui/qt/util/qml_main_context.cpp \
-	gui/qt/util/qml_main_context.hpp \
-	gui/qt/dialogs/help/aboutmodel.cpp \
-	gui/qt/dialogs/help/aboutmodel.hpp \
 	gui/qt/dialogs/dialogs/dialogmodel.cpp \
 	gui/qt/dialogs/dialogs/dialogmodel.hpp \
-	gui/qt/dialogs/extended/extended_panels.cpp \
-	gui/qt/dialogs/extended/extended_panels.hpp \
-	gui/qt/util/navigation_history.cpp gui/qt/util/navigation_history.hpp \
-	gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
-	gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \
-	gui/qt/util/selectable_list_model.hpp \
-	gui/qt/util/selectable_list_model.cpp \
-	gui/qt/dialogs/preferences/preferences.cpp gui/qt/preferences/preferences.hpp \
-	gui/qt/dialogs/preferences/preferences_widgets.cpp \
-	gui/qt/dialogs/preferences/preferences_widgets.hpp \
-	gui/qt/dialogs/preferences/complete_preferences.cpp \
-	gui/qt/dialogs/preferences/complete_preferences.hpp \
-	gui/qt/dialogs/preferences/simple_preferences.cpp \
-	gui/qt/dialogs/preferences/simple_preferences.hpp \
-	gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
-	gui/qt/widgets/native/interface_widgets.cpp \
-	gui/qt/widgets/native/interface_widgets.hpp \
-	gui/qt/util/recent_media_model.cpp  \
-	gui/qt/util/recent_media_model.hpp \
-	gui/qt/util/settings.cpp \
-	gui/qt/util/settings.hpp \
-	gui/qt/util/audio_device_model.cpp  \
-	gui/qt/util/audio_device_model.hpp \
-	gui/qt/voutwindow/videosurface.cpp \
-	gui/qt/voutwindow/videosurface.hpp \
-	gui/qt/voutwindow/qvoutwindow.cpp \
-	gui/qt/voutwindow/qvoutwindow.hpp \
-	gui/qt/voutwindow/qvoutwindowdummy.cpp \
-	gui/qt/voutwindow/qvoutwindowdummy.hpp \
-	gui/qt/menus/custom_menus.cpp \
-	gui/qt/menus/custom_menus.hpp \
-	gui/qt/dialogs/epg/epg.cpp gui/qt/dialogs/epg/epg.hpp \
+	gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \
 	gui/qt/dialogs/epg/EPGChannels.cpp \
 	gui/qt/dialogs/epg/EPGChannels.hpp \
 	gui/qt/dialogs/epg/EPGItem.cpp \
@@ -126,12 +60,52 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/epg/EPGView.cpp gui/qt/dialogs/epg/EPGView.hpp \
 	gui/qt/dialogs/epg/EPGWidget.cpp \
 	gui/qt/dialogs/epg/EPGWidget.hpp \
+	gui/qt/dialogs/epg/epg.cpp gui/qt/dialogs/epg/epg.hpp \
+	gui/qt/dialogs/errors/errors.cpp gui/qt/dialogs/errors/errors.hpp \
+	gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \
+	gui/qt/dialogs/extended/extended_panels.cpp \
+	gui/qt/dialogs/extended/extended_panels.hpp \
+	gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \
+	gui/qt/dialogs/extensions/extensions_manager.cpp gui/qt/dialogs/extensions/extensions_manager.hpp \
+	gui/qt/dialogs/fingerprint/chromaprint.cpp \
+	gui/qt/dialogs/fingerprint/chromaprint.hpp \
+	gui/qt/dialogs/fingerprint/fingerprintdialog.cpp \
+	gui/qt/dialogs/fingerprint/fingerprintdialog.hpp \
+	gui/qt/dialogs/firstrun/firstrun.cpp gui/qt/dialogs/firstrun/firstrun.hpp \
+	gui/qt/dialogs/gototime/gototime.cpp gui/qt/dialogs/gototime/gototime.hpp \
+	gui/qt/dialogs/help/aboutmodel.cpp \
+	gui/qt/dialogs/help/aboutmodel.hpp \
+	gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
+	gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \
+	gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \
+	gui/qt/dialogs/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \
+	gui/qt/dialogs/messages/messages.cpp gui/qt/dialogs/messages/messages.hpp \
+	gui/qt/dialogs/open/open.cpp gui/qt/dialogs/open/open.hpp \
+	gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
+	gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
+	gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
+	gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
+	gui/qt/dialogs/podcast/podcast_configuration.cpp \
+	gui/qt/dialogs/podcast/podcast_configuration.hpp \
+	gui/qt/dialogs/preferences/complete_preferences.cpp \
+	gui/qt/dialogs/preferences/complete_preferences.hpp \
+	gui/qt/dialogs/preferences/preferences.cpp gui/qt/preferences/preferences.hpp \
+	gui/qt/dialogs/preferences/preferences_widgets.cpp \
+	gui/qt/dialogs/preferences/preferences_widgets.hpp \
+	gui/qt/dialogs/preferences/simple_preferences.cpp \
+	gui/qt/dialogs/preferences/simple_preferences.hpp \
+	gui/qt/dialogs/sout/convert.cpp gui/qt/dialogs/sout/convert.hpp \
+	gui/qt/dialogs/sout/profile_selector.cpp \
+	gui/qt/dialogs/sout/profile_selector.hpp \
+	gui/qt/dialogs/sout/profiles.hpp \
+	gui/qt/dialogs/sout/sout.cpp gui/qt/dialogs/sout/sout.hpp \
+	gui/qt/dialogs/sout/sout_widgets.cpp \
+	gui/qt/dialogs/sout/sout_widgets.hpp \
+	gui/qt/dialogs/toolbar/toolbareditor.cpp gui/qt/dialogs/toolbar/toolbareditor.hpp \
+	gui/qt/dialogs/vlm/vlm.cpp gui/qt/dialogs/vlm/vlm.hpp \
+	gui/qt/maininterface/main_interface.cpp gui/qt/maininterface/main_interface.hpp \
 	gui/qt/medialibrary/medialib.cpp \
 	gui/qt/medialibrary/medialib.hpp \
-	gui/qt/medialibrary/mlhelper.hpp \
-	gui/qt/medialibrary/mlqmltypes.hpp \
-	gui/qt/medialibrary/mlbasemodel.cpp \
-	gui/qt/medialibrary/mlbasemodel.hpp \
 	gui/qt/medialibrary/mlalbum.cpp \
 	gui/qt/medialibrary/mlalbum.hpp \
 	gui/qt/medialibrary/mlalbummodel.cpp \
@@ -144,24 +118,34 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/medialibrary/mlartist.hpp \
 	gui/qt/medialibrary/mlartistmodel.cpp \
 	gui/qt/medialibrary/mlartistmodel.hpp \
+	gui/qt/medialibrary/mlbasemodel.cpp \
+	gui/qt/medialibrary/mlbasemodel.hpp \
 	gui/qt/medialibrary/mlfoldersmodel.cpp \
 	gui/qt/medialibrary/mlfoldersmodel.hpp \
 	gui/qt/medialibrary/mlgenre.cpp \
 	gui/qt/medialibrary/mlgenre.hpp \
 	gui/qt/medialibrary/mlgenremodel.cpp \
 	gui/qt/medialibrary/mlgenremodel.hpp \
-	gui/qt/medialibrary/mlvideo.hpp \
+	gui/qt/medialibrary/mlhelper.hpp \
+	gui/qt/medialibrary/mlqmltypes.hpp \
+	gui/qt/medialibrary/mlrecentsvideomodel.cpp \
+	gui/qt/medialibrary/mlrecentsvideomodel.hpp \
 	gui/qt/medialibrary/mlvideo.cpp \
+	gui/qt/medialibrary/mlvideo.hpp \
 	gui/qt/medialibrary/mlvideomodel.cpp \
 	gui/qt/medialibrary/mlvideomodel.hpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.cpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.hpp \
+	gui/qt/menus/custom_menus.cpp \
+	gui/qt/menus/custom_menus.hpp \
+	gui/qt/menus/menus.cpp gui/qt/menus/menus.hpp \
 	gui/qt/network/networkdevicemodel.cpp \
 	gui/qt/network/networkdevicemodel.hpp \
 	gui/qt/network/networkmediamodel.cpp \
 	gui/qt/network/networkmediamodel.hpp \
 	gui/qt/network/networksourcelistener.cpp \
 	gui/qt/network/networksourcelistener.hpp \
+	gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
+	gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
+	gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \
 	gui/qt/playlist/media.hpp \
 	gui/qt/playlist/playlist_common.cpp \
 	gui/qt/playlist/playlist_common.hpp \
@@ -173,30 +157,46 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/playlist/playlist_model.cpp \
 	gui/qt/playlist/playlist_model.hpp \
 	gui/qt/playlist/playlist_model_p.hpp \
-	gui/qt/dialogs/sout/convert.cpp gui/qt/dialogs/sout/convert.hpp \
-	gui/qt/dialogs/sout/sout.cpp gui/qt/dialogs/sout/sout.hpp \
-	gui/qt/dialogs/sout/profile_selector.cpp \
-	gui/qt/dialogs/sout/profile_selector.hpp \
-	gui/qt/dialogs/sout/sout_widgets.cpp \
-	gui/qt/dialogs/sout/sout_widgets.hpp \
-	gui/qt/dialogs/sout/profiles.hpp \
-	gui/qt/widgets/native/animators.cpp gui/qt/widgets/animators.hpp \
-	gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
-	gui/qt/widgets/native/customwidgets.cpp gui/qt/widgets/native/customwidgets.hpp \
-	gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp \
-	gui/qt/util/registry.cpp gui/qt/util/registry.hpp \
-	gui/qt/util/soutchain.cpp gui/qt/util/soutchain.hpp \
-	gui/qt/util/qt_dirs.cpp gui/qt/util/qt_dirs.hpp \
-	gui/qt/util/validators.cpp gui/qt/util/validators.hpp \
-	gui/qt/widgets/native/qvlcframe.cpp \
-	gui/qt/widgets/native/qvlcframe.hpp \
-	gui/qt/util/qvlcapp.hpp \
+	gui/qt/util/audio_device_model.cpp  \
+	gui/qt/util/audio_device_model.hpp \
+	gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp \
+	gui/qt/util/navigation_history.cpp gui/qt/util/navigation_history.hpp \
+	gui/qt/util/qml_main_context.cpp \
+	gui/qt/util/qml_main_context.hpp \
 	gui/qt/util/qmleventfilter.cpp \
 	gui/qt/util/qmleventfilter.hpp \
+	gui/qt/util/qt_dirs.cpp gui/qt/util/qt_dirs.hpp \
+	gui/qt/util/qvlcapp.hpp \
+	gui/qt/util/recent_media_model.cpp  \
+	gui/qt/util/recent_media_model.hpp \
+	gui/qt/util/recents.cpp gui/qt/util/recents.hpp \
+	gui/qt/util/registry.cpp gui/qt/util/registry.hpp \
+	gui/qt/util/renderer_manager.cpp gui/qt/util/renderer_manager.hpp \
+	gui/qt/util/selectable_list_model.cpp \
+	gui/qt/util/selectable_list_model.hpp \
+	gui/qt/util/settings.cpp \
+	gui/qt/util/settings.hpp \
 	gui/qt/util/singleton.hpp \
+	gui/qt/util/soutchain.cpp gui/qt/util/soutchain.hpp \
+	gui/qt/util/validators.cpp gui/qt/util/validators.hpp \
+	gui/qt/util/var_common_p.hpp \
+	gui/qt/util/varchoicemodel.cpp  gui/qt/util/varchoicemodel.hpp \
+	gui/qt/util/variables.cpp gui/qt/util/variables.hpp \
 	gui/qt/util/vlctick.cpp \
 	gui/qt/util/vlctick.hpp \
-	gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp
+	gui/qt/voutwindow/qvoutwindow.cpp \
+	gui/qt/voutwindow/qvoutwindow.hpp \
+	gui/qt/voutwindow/qvoutwindowdummy.cpp \
+	gui/qt/voutwindow/qvoutwindowdummy.hpp \
+	gui/qt/voutwindow/videosurface.cpp \
+	gui/qt/voutwindow/videosurface.hpp \
+	gui/qt/widgets/native/animators.cpp gui/qt/widgets/animators.hpp \
+	gui/qt/widgets/native/customwidgets.cpp gui/qt/widgets/native/customwidgets.hpp \
+	gui/qt/widgets/native/interface_widgets.cpp \
+	gui/qt/widgets/native/interface_widgets.hpp \
+	gui/qt/widgets/native/qvlcframe.cpp \
+	gui/qt/widgets/native/qvlcframe.hpp \
+	gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp
 if HAVE_WIN32
 libqt_plugin_la_SOURCES += \
 	gui/qt/maininterface/main_interface_win32.cpp gui/qt/maininterface/main_interface_win32.hpp
@@ -216,94 +216,94 @@ moc_verbose__0 = $(moc_verbose_0)
 dialogs/dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
 
 nodist_libqt_plugin_la_SOURCES = \
-	gui/qt/maininterface/main_interface.moc.cpp \
-	gui/qt/menus/menus.moc.cpp \
-	gui/qt/dialogs/dialogs_provider.moc.cpp \
-	gui/qt/util/renderer_manager.moc.cpp \
-	gui/qt/util/recents.moc.cpp \
-	gui/qt/util/variables.moc.cpp \
-	gui/qt/util/varchoicemodel.moc.cpp \
 	gui/qt/dialogs/bookmarks/bookmarks.moc.cpp \
-	gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \
+	gui/qt/dialogs/dialogs/dialogmodel.moc.cpp \
+	gui/qt/dialogs/dialogs_provider.moc.cpp \
+	gui/qt/dialogs/epg/EPGChannels.moc.cpp \
+	gui/qt/dialogs/epg/EPGProgram.moc.cpp \
+	gui/qt/dialogs/epg/EPGRuler.moc.cpp \
+	gui/qt/dialogs/epg/EPGView.moc.cpp \
+	gui/qt/dialogs/epg/EPGWidget.moc.cpp \
+	gui/qt/dialogs/epg/epg.moc.cpp \
+	gui/qt/dialogs/errors/errors.moc.cpp \
+	gui/qt/dialogs/extended/extended.moc.cpp \
+	gui/qt/dialogs/extended/extended_panels.moc.cpp \
+	gui/qt/dialogs/extensions/extensions.moc.cpp \
+	gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
+	gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
+	gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
+	gui/qt/dialogs/firstrun/firstrun.moc.cpp \
+	gui/qt/dialogs/gototime/gototime.moc.cpp \
+	gui/qt/dialogs/help/aboutmodel.moc.cpp \
+	gui/qt/dialogs/help/help.moc.cpp \
 	gui/qt/dialogs/mediainfo/info_panels.moc.cpp \
 	gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \
-	gui/qt/dialogs/extended/extended.moc.cpp \
+	gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \
 	gui/qt/dialogs/messages/messages.moc.cpp \
-	gui/qt/dialogs/errors/errors.moc.cpp \
-	gui/qt/dialogs/plugins/addons_manager.moc.cpp \
-	gui/qt/dialogs/plugins/plugins.moc.cpp \
-	gui/qt/dialogs/help/help.moc.cpp \
-	gui/qt/dialogs/gototime/gototime.moc.cpp \
-	gui/qt/dialogs/toolbar/toolbareditor.moc.cpp \
 	gui/qt/dialogs/open/open.moc.cpp \
+	gui/qt/dialogs/open/open_panels.moc.cpp \
 	gui/qt/dialogs/open/openurl.moc.cpp \
+	gui/qt/dialogs/plugins/addons_manager.moc.cpp \
+	gui/qt/dialogs/plugins/plugins.moc.cpp \
 	gui/qt/dialogs/podcast/podcast_configuration.moc.cpp \
-	gui/qt/dialogs/firstrun/firstrun.moc.cpp \
-	gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
-	gui/qt/dialogs/extensions/extensions.moc.cpp \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
-	gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
-	gui/qt/util/qml_main_context.moc.cpp \
-	gui/qt/dialogs/help/aboutmodel.moc.cpp \
-	gui/qt/dialogs/dialogs/dialogmodel.moc.cpp \
-	gui/qt/dialogs/extended/extended_panels.moc.cpp \
-	gui/qt/player/player_controller.moc.cpp \
-	gui/qt/player/playercontrolbarmodel.moc.cpp \
+	gui/qt/dialogs/preferences/complete_preferences.moc.cpp \
 	gui/qt/dialogs/preferences/preferences.moc.cpp \
 	gui/qt/dialogs/preferences/preferences_widgets.moc.cpp \
-	gui/qt/dialogs/preferences/complete_preferences.moc.cpp \
 	gui/qt/dialogs/preferences/simple_preferences.moc.cpp \
-	gui/qt/dialogs/open/open_panels.moc.cpp \
-	gui/qt/widgets/native/interface_widgets.moc.cpp \
-	gui/qt/util/navigation_history.moc.cpp \
-	gui/qt/menus/custom_menus.moc.cpp \
-	gui/qt/util/recent_media_model.moc.cpp \
-	gui/qt/util/selectable_list_model.moc.cpp \
-	gui/qt/util/settings.moc.cpp \
-	gui/qt/util/audio_device_model.moc.cpp \
-	gui/qt/voutwindow/videosurface.moc.cpp \
-	gui/qt/voutwindow/qvoutwindow.moc.cpp \
-	gui/qt/voutwindow/qvoutwindowdummy.moc.cpp \
-	gui/qt/dialogs/epg/epg.moc.cpp \
-	gui/qt/dialogs/epg/EPGChannels.moc.cpp \
-	gui/qt/dialogs/epg/EPGProgram.moc.cpp \
-	gui/qt/dialogs/epg/EPGRuler.moc.cpp \
-	gui/qt/dialogs/epg/EPGView.moc.cpp \
-	gui/qt/dialogs/epg/EPGWidget.moc.cpp \
+	gui/qt/dialogs/sout/convert.moc.cpp \
+	gui/qt/dialogs/sout/profile_selector.moc.cpp \
+	gui/qt/dialogs/sout/sout.moc.cpp \
+	gui/qt/dialogs/sout/sout_widgets.moc.cpp \
+	gui/qt/dialogs/toolbar/toolbareditor.moc.cpp \
+	gui/qt/maininterface/main_interface.moc.cpp \
 	gui/qt/medialibrary/medialib.moc.cpp \
-	gui/qt/medialibrary/mlqmltypes.moc.cpp \
-	gui/qt/medialibrary/mlbasemodel.moc.cpp \
 	gui/qt/medialibrary/mlalbum.moc.cpp \
 	gui/qt/medialibrary/mlalbummodel.moc.cpp \
 	gui/qt/medialibrary/mlalbumtrack.moc.cpp \
 	gui/qt/medialibrary/mlalbumtrackmodel.moc.cpp \
 	gui/qt/medialibrary/mlartist.moc.cpp \
 	gui/qt/medialibrary/mlartistmodel.moc.cpp \
+	gui/qt/medialibrary/mlbasemodel.moc.cpp \
 	gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
 	gui/qt/medialibrary/mlgenre.moc.cpp \
 	gui/qt/medialibrary/mlgenremodel.moc.cpp \
+	gui/qt/medialibrary/mlqmltypes.moc.cpp \
+	gui/qt/medialibrary/mlrecentsvideomodel.moc.cpp \
 	gui/qt/medialibrary/mlvideo.moc.cpp \
 	gui/qt/medialibrary/mlvideomodel.moc.cpp \
-	gui/qt/medialibrary/mlrecentsvideomodel.moc.cpp \
+	gui/qt/menus/custom_menus.moc.cpp \
+	gui/qt/menus/menus.moc.cpp \
 	gui/qt/network/networkdevicemodel.moc.cpp \
 	gui/qt/network/networkmediamodel.moc.cpp \
 	gui/qt/network/networksourcelistener.moc.cpp \
+	gui/qt/player/input_models.moc.cpp \
+	gui/qt/player/player_controller.moc.cpp \
+	gui/qt/player/playercontrolbarmodel.moc.cpp \
 	gui/qt/playlist/playlist_common.moc.cpp \
+	gui/qt/playlist/playlist_controller.moc.cpp \
 	gui/qt/playlist/playlist_item.moc.cpp \
 	gui/qt/playlist/playlist_model.moc.cpp \
-	gui/qt/playlist/playlist_controller.moc.cpp \
-	gui/qt/dialogs/sout/convert.moc.cpp \
-	gui/qt/dialogs/sout/sout.moc.cpp \
-	gui/qt/dialogs/sout/profile_selector.moc.cpp \
-	gui/qt/dialogs/sout/sout_widgets.moc.cpp \
-	gui/qt/widgets/native/animators.moc.cpp \
-	gui/qt/player/input_models.moc.cpp \
-	gui/qt/widgets/native/customwidgets.moc.cpp \
+	gui/qt/util/audio_device_model.moc.cpp \
+	gui/qt/util/navigation_history.moc.cpp \
+	gui/qt/util/qml_main_context.moc.cpp \
 	gui/qt/util/qmleventfilter.moc.cpp \
-	gui/qt/widgets/native/searchlineedit.moc.cpp \
 	gui/qt/util/qvlcapp.moc.cpp \
+	gui/qt/util/recent_media_model.moc.cpp \
+	gui/qt/util/recents.moc.cpp \
+	gui/qt/util/renderer_manager.moc.cpp \
+	gui/qt/util/selectable_list_model.moc.cpp \
+	gui/qt/util/settings.moc.cpp \
+	gui/qt/util/validators.moc.cpp \
+	gui/qt/util/varchoicemodel.moc.cpp \
+	gui/qt/util/variables.moc.cpp \
 	gui/qt/util/vlctick.moc.cpp \
-	gui/qt/util/validators.moc.cpp
+	gui/qt/voutwindow/qvoutwindow.moc.cpp \
+	gui/qt/voutwindow/qvoutwindowdummy.moc.cpp \
+	gui/qt/voutwindow/videosurface.moc.cpp \
+	gui/qt/widgets/native/animators.moc.cpp \
+	gui/qt/widgets/native/customwidgets.moc.cpp \
+	gui/qt/widgets/native/interface_widgets.moc.cpp \
+	gui/qt/widgets/native/searchlineedit.moc.cpp
 
 if HAVE_WIN32
 nodist_libqt_plugin_la_SOURCES += gui/qt/maininterface/main_interface_win32.moc.cpp
@@ -312,24 +312,24 @@ endif
 nodist_libqt_plugin_la_SOURCES += \
 	gui/qt/dialogs/extended/ui_equalizer.h \
 	gui/qt/dialogs/extended/ui_video_effects.h \
-	gui/qt/dialogs/open/ui_open_file.h \
+	gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
+	gui/qt/dialogs/help/ui_about.h \
+	gui/qt/dialogs/help/ui_update.h \
+	gui/qt/dialogs/messages/ui_messages_panel.h \
+	gui/qt/dialogs/open/ui_open.h \
+	gui/qt/dialogs/open/ui_open_capture.h \
 	gui/qt/dialogs/open/ui_open_disk.h \
+	gui/qt/dialogs/open/ui_open_file.h \
 	gui/qt/dialogs/open/ui_open_net.h \
-	gui/qt/dialogs/open/ui_open_capture.h \
-	gui/qt/dialogs/open/ui_open.h \
-	gui/qt/dialogs/vlm/ui_vlm.h \
 	gui/qt/dialogs/podcast/ui_podcast_configuration.h \
-	gui/qt/dialogs/sout/ui_profiles.h \
 	gui/qt/dialogs/preferences/ui_sprefs_audio.h \
 	gui/qt/dialogs/preferences/ui_sprefs_input.h \
 	gui/qt/dialogs/preferences/ui_sprefs_interface.h \
 	gui/qt/dialogs/preferences/ui_sprefs_subtitles.h \
 	gui/qt/dialogs/preferences/ui_sprefs_video.h \
-	gui/qt/dialogs/messages/ui_messages_panel.h \
-	gui/qt/dialogs/help/ui_about.h \
-	gui/qt/dialogs/help/ui_update.h \
-	gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
-	gui/qt/dialogs/sout/ui_sout.h
+	gui/qt/dialogs/sout/ui_profiles.h \
+	gui/qt/dialogs/sout/ui_sout.h \
+	gui/qt/dialogs/vlm/ui_vlm.h
 
 # User interface compilation
 
@@ -351,24 +351,24 @@ endif
 libqt_plugin_la_UI = \
 	gui/qt/dialogs/extended/equalizer.ui \
 	gui/qt/dialogs/extended/video_effects.ui \
-	gui/qt/dialogs/open/open_file.ui \
+	gui/qt/dialogs/fingerprint/fingerprintdialog.ui \
+	gui/qt/dialogs/help/about.ui \
+	gui/qt/dialogs/help/update.ui \
+	gui/qt/dialogs/messages/messages_panel.ui \
+	gui/qt/dialogs/open/open.ui \
+	gui/qt/dialogs/open/open_capture.ui \
 	gui/qt/dialogs/open/open_disk.ui \
+	gui/qt/dialogs/open/open_file.ui \
 	gui/qt/dialogs/open/open_net.ui \
-	gui/qt/dialogs/open/open_capture.ui \
-	gui/qt/dialogs/open/open.ui \
 	gui/qt/dialogs/podcast/podcast_configuration.ui \
-	gui/qt/dialogs/sout/profiles.ui \
 	gui/qt/dialogs/preferences/sprefs_audio.ui \
 	gui/qt/dialogs/preferences/sprefs_input.ui \
 	gui/qt/dialogs/preferences/sprefs_interface.ui \
 	gui/qt/dialogs/preferences/sprefs_subtitles.ui \
 	gui/qt/dialogs/preferences/sprefs_video.ui \
-	gui/qt/dialogs/messages/messages_panel.ui \
-	gui/qt/dialogs/help/about.ui \
-	gui/qt/dialogs/help/update.ui \
+	gui/qt/dialogs/sout/profiles.ui \
 	gui/qt/dialogs/sout/sout.ui \
-	gui/qt/dialogs/vlm/vlm.ui \
-	gui/qt/dialogs/fingerprint/fingerprintdialog.ui
+	gui/qt/dialogs/vlm/vlm.ui
 EXTRA_DIST += $(libqt_plugin_la_UI)
 
 ui_%.h: %.ui
@@ -538,104 +538,104 @@ libqt_plugin_la_RES = \
 
 #QML and JS resources
 libqt_plugin_la_QML = \
-	gui/qt/maininterface/qml/MainInterface.qml \
-	gui/qt/maininterface/qml/BannerSources.qml \
+	gui/qt/dialogs/dialogs/qml/Dialogs.qml \
+	gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
 	gui/qt/dialogs/help/qml/About.qml \
-	gui/qt/player/qml/Player.qml \
-	gui/qt/player/qml/TrackInfo.qml \
+	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
+	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
+	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
+	gui/qt/dialogs/toolbar/qml/EditorTabButton.qml \
+	gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml \
+	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
+	gui/qt/maininterface/qml/BannerSources.qml \
+	gui/qt/maininterface/qml/MainInterface.qml \
+	gui/qt/medialibrary/qml/ArtistTopBanner.qml \
+	gui/qt/medialibrary/qml/AudioGridItem.qml \
+	gui/qt/medialibrary/qml/MainDisplay.qml \
+	gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
+	gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
+	gui/qt/medialibrary/qml/MusicArtistsDisplay.qml \
+	gui/qt/medialibrary/qml/MusicDisplay.qml \
+	gui/qt/medialibrary/qml/MusicGenresDisplay.qml \
+	gui/qt/medialibrary/qml/MusicTrackListDisplay.qml \
+	gui/qt/medialibrary/qml/MusicTracksDisplay.qml \
+	gui/qt/medialibrary/qml/VideoDisplay.qml \
+	gui/qt/medialibrary/qml/VideoGridItem.qml \
+	gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml \
+	gui/qt/medialibrary/qml/VideoListDisplay.qml \
+	gui/qt/menus/qml/AudioMenu.qml \
+	gui/qt/menus/qml/CheckableModelSubMenu.qml \
+	gui/qt/menus/qml/HelpMenu.qml \
+	gui/qt/menus/qml/MainDropdownMenu.qml \
+	gui/qt/menus/qml/MainMenubar.qml \
+	gui/qt/menus/qml/MediaMenu.qml \
+	gui/qt/menus/qml/PlaybackMenu.qml \
+	gui/qt/menus/qml/PopupMenu.qml \
+	gui/qt/menus/qml/SubtitleMenu.qml \
+	gui/qt/menus/qml/ToolsMenu.qml \
+	gui/qt/menus/qml/VideoMenu.qml \
+	gui/qt/menus/qml/ViewMenu.qml \
+	gui/qt/network/qml/NetworkBrowseDisplay.qml \
+	gui/qt/network/qml/NetworkDisplay.qml \
+	gui/qt/network/qml/NetworkGridItem.qml \
+	gui/qt/network/qml/NetworkHomeDisplay.qml \
+	gui/qt/network/qml/NetworkListItem.qml \
+	gui/qt/network/qml/NetworksSectionSelectableDM.qml \
 	gui/qt/player/qml/ControlBar.qml \
 	gui/qt/player/qml/ControlButtons.qml \
+	gui/qt/player/qml/MiniPlayer.qml \
+	gui/qt/player/qml/Player.qml \
 	gui/qt/player/qml/PlayerButtonsLayout.qml \
 	gui/qt/player/qml/PlayerMenu.qml \
 	gui/qt/player/qml/PlayerMenuItem.qml \
-	gui/qt/player/qml/VolumeWidget.qml \
 	gui/qt/player/qml/SliderBar.qml \
 	gui/qt/player/qml/TeletextWidget.qml \
-	gui/qt/player/qml/MiniPlayer.qml \
 	gui/qt/player/qml/TopBar.qml \
-	gui/qt/dialogs/dialogs/qml/Dialogs.qml \
-	gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
-	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
-	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
-	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
-	gui/qt/dialogs/toolbar/qml/EditorTabButton.qml \
-	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
-	gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml \
+	gui/qt/player/qml/TrackInfo.qml \
+	gui/qt/player/qml/VolumeWidget.qml \
+	gui/qt/playlist/qml/PLItem.qml \
+	gui/qt/playlist/qml/PLItemFooter.qml \
+	gui/qt/playlist/qml/PlaylistListView.qml \
+	gui/qt/playlist/qml/PlaylistMainView.qml \
+	gui/qt/playlist/qml/PlaylistMenu.qml \
+	gui/qt/playlist/qml/PlaylistToolbar.qml \
+	gui/qt/style/VLCColors.qml \
+	gui/qt/style/VLCIcons.qml \
+	gui/qt/style/VLCStyle.qml \
+	gui/qt/style/qmldir \
 	gui/qt/util/qml/KeyHelper.js \
 	gui/qt/util/qml/SelectableDelegateModel.qml \
 	gui/qt/widgets/qml/BusyIndicatorExt.qml \
+	gui/qt/widgets/qml/ComboBoxExt.qml \
+	gui/qt/widgets/qml/ContextButton.qml \
 	gui/qt/widgets/qml/DNDLabel.qml \
-	gui/qt/widgets/qml/ToolTipArea.qml \
 	gui/qt/widgets/qml/DrawerExt.qml \
+	gui/qt/widgets/qml/ExpandGridView.qml \
 	gui/qt/widgets/qml/GridItem.qml \
-	gui/qt/widgets/qml/ContextButton.qml \
 	gui/qt/widgets/qml/IconToolButton.qml \
 	gui/qt/widgets/qml/ImageToolButton.qml \
-	gui/qt/widgets/qml/TextToolButton.qml \
-	gui/qt/widgets/qml/MenuExt.qml \
-	gui/qt/widgets/qml/MenuItemExt.qml \
-	gui/qt/widgets/qml/ListItem.qml \
-	gui/qt/widgets/qml/ExpandGridView.qml \
-	gui/qt/widgets/qml/NavigableFocusScope.qml \
-	gui/qt/widgets/qml/NavigableCol.qml \
-	gui/qt/widgets/qml/NavigableRow.qml \
 	gui/qt/widgets/qml/KeyNavigableGridView.qml \
 	gui/qt/widgets/qml/KeyNavigableListView.qml \
 	gui/qt/widgets/qml/KeyNavigableTableView.qml \
-	gui/qt/widgets/qml/ComboBoxExt.qml \
-	gui/qt/widgets/qml/SpinBoxExt.qml \
-	gui/qt/widgets/qml/StackViewExt.qml \
-	gui/qt/widgets/qml/ScanProgressBar.qml \
-	gui/qt/widgets/qml/TabButtonExt.qml \
 	gui/qt/widgets/qml/LabelSeparator.qml \
+	gui/qt/widgets/qml/ListItem.qml \
+	gui/qt/widgets/qml/MenuExt.qml \
+	gui/qt/widgets/qml/MenuItemExt.qml \
+	gui/qt/widgets/qml/NavigableCol.qml \
+	gui/qt/widgets/qml/NavigableFocusScope.qml \
+	gui/qt/widgets/qml/NavigableRow.qml \
 	gui/qt/widgets/qml/RoundButton.qml \
 	gui/qt/widgets/qml/RoundImage.qml \
-	gui/qt/widgets/qml/VideoQualityLabel.qml \
-	gui/qt/widgets/qml/VideoProgressBar.qml \
+	gui/qt/widgets/qml/ScanProgressBar.qml \
 	gui/qt/widgets/qml/SearchBox.qml \
 	gui/qt/widgets/qml/SortControl.qml \
-	gui/qt/menus/qml/CheckableModelSubMenu.qml \
-	gui/qt/menus/qml/AudioMenu.qml \
-	gui/qt/menus/qml/HelpMenu.qml \
-	gui/qt/menus/qml/MainDropdownMenu.qml \
-	gui/qt/menus/qml/MainMenubar.qml \
-	gui/qt/menus/qml/MediaMenu.qml \
-	gui/qt/menus/qml/PlaybackMenu.qml \
-	gui/qt/menus/qml/PopupMenu.qml \
-	gui/qt/menus/qml/SubtitleMenu.qml \
-	gui/qt/menus/qml/ToolsMenu.qml \
-	gui/qt/menus/qml/ViewMenu.qml \
-	gui/qt/menus/qml/VideoMenu.qml \
-	gui/qt/medialibrary/qml/ArtistTopBanner.qml \
-	gui/qt/medialibrary/qml/AudioGridItem.qml \
-	gui/qt/medialibrary/qml/MainDisplay.qml \
-	gui/qt/medialibrary/qml/MusicDisplay.qml \
-	gui/qt/medialibrary/qml/VideoDisplay.qml \
-	gui/qt/medialibrary/qml/VideoListDisplay.qml \
-	gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
-	gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
-	gui/qt/medialibrary/qml/MusicArtistsDisplay.qml \
-	gui/qt/medialibrary/qml/MusicGenresDisplay.qml \
-	gui/qt/medialibrary/qml/MusicTracksDisplay.qml \
-	gui/qt/medialibrary/qml/MusicTrackListDisplay.qml \
-	gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml \
-	gui/qt/medialibrary/qml/VideoGridItem.qml \
-	gui/qt/network/qml/NetworkDisplay.qml \
-	gui/qt/network/qml/NetworkBrowseDisplay.qml \
-	gui/qt/network/qml/NetworkHomeDisplay.qml \
-	gui/qt/network/qml/NetworksSectionSelectableDM.qml \
-	gui/qt/network/qml/NetworkGridItem.qml \
-	gui/qt/network/qml/NetworkListItem.qml \
-	gui/qt/playlist/qml/PlaylistListView.qml \
-	gui/qt/playlist/qml/PlaylistMainView.qml \
-	gui/qt/playlist/qml/PlaylistToolbar.qml \
-	gui/qt/playlist/qml/PLItem.qml \
-	gui/qt/playlist/qml/PLItemFooter.qml \
-	gui/qt/playlist/qml/PlaylistMenu.qml \
-	gui/qt/style/qmldir \
-	gui/qt/style/VLCIcons.qml \
-	gui/qt/style/VLCStyle.qml \
-	gui/qt/style/VLCColors.qml
+	gui/qt/widgets/qml/SpinBoxExt.qml \
+	gui/qt/widgets/qml/StackViewExt.qml \
+	gui/qt/widgets/qml/TabButtonExt.qml \
+	gui/qt/widgets/qml/TextToolButton.qml \
+	gui/qt/widgets/qml/ToolTipArea.qml \
+	gui/qt/widgets/qml/VideoProgressBar.qml \
+	gui/qt/widgets/qml/VideoQualityLabel.qml
 
 EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
 



More information about the vlc-commits mailing list