at qt4 termination, ensure quit() function is executed in the right thread

[vlc] / modules / gui / qt4 / Modules.am

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index b2356fdfd783c5bacf5bcf65f7eba490306ae991..ce0f73e62cd9b8a9c9c5d8ab8bba1e96e3c4d703 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -7,6 +7,8 @@
 # For each UI
 #   - Add it to EXTRA_DIST
 #   - Add the .h to nodist_SOURCES_qt4
+# For each ressource (icon, png, ...)
+#   - Add it to DEPS_res
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
@@ -17,6 +19,7 @@ nodist_SOURCES_qt4 = \
                menus.moc.cpp \
                dialogs_provider.moc.cpp \
                input_manager.moc.cpp \
+               actions_manager.moc.cpp \
                recents.moc.cpp \
                dialogs/playlist.moc.cpp \
                dialogs/bookmarks.moc.cpp \
@@ -24,13 +27,16 @@ nodist_SOURCES_qt4 = \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
                dialogs/errors.moc.cpp \
+               dialogs/external.moc.cpp \
+               dialogs/plugins.moc.cpp \
                dialogs/preferences.moc.cpp \
-               dialogs/interaction.moc.cpp \
                dialogs/sout.moc.cpp \
+               dialogs/convert.moc.cpp \
                dialogs/help.moc.cpp \
                dialogs/gototime.moc.cpp \
                dialogs/toolbar.moc.cpp \
                dialogs/open.moc.cpp \
+               dialogs/openurl.moc.cpp \
                dialogs/podcast_configuration.moc.cpp \
                dialogs/vlm.moc.cpp \
                components/extended_panels.moc.cpp \
@@ -41,13 +47,17 @@ nodist_SOURCES_qt4 = \
                components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
                components/controller.moc.cpp \
+               components/controller_widget.moc.cpp \
                components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist_item.moc.cpp \
                components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
+               components/sout/profile_selector.moc.cpp \
+               components/sout/sout_widgets.moc.cpp \
                util/input_slider.moc.cpp \
                util/customwidgets.moc.cpp \
+               util/qvlcapp.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
                ui/v4l2.h \
@@ -59,6 +69,7 @@ nodist_SOURCES_qt4 = \
                ui/open.h \
                ui/vlm.h \
                ui/podcast_configuration.h \
+               ui/profiles.h \
                ui/sprefs_audio.h \
                ui/sprefs_input.h \
                ui/sprefs_interface.h \
@@ -111,6 +122,7 @@ DEPS_res = \
        pixmaps/prefs/spref_cone_Video_64.png \
        pixmaps/previous.png \
        pixmaps/previous_16px.png \
+       pixmaps/profile_new.png \
        pixmaps/slower.png \
        pixmaps/space.png \
        pixmaps/stop.png \
@@ -127,12 +139,12 @@ DEPS_res = \
        pixmaps/toolbar/extended_16px.png \
        pixmaps/toolbar/frame-by-frame.png \
        pixmaps/toolbar/fullscreen.png \
+       pixmaps/toolbar/play_reverse.png \
        pixmaps/toolbar/record_16px.png \
        pixmaps/toolbar/snapshot.png \
        pixmaps/toolbar/skip_for.png \
        pixmaps/toolbar/skip_back.png \
        pixmaps/toolbar/tv.png \
-       pixmaps/toolbar/tvtelx-transparent.png \
        pixmaps/toolbar/tvtelx.png \
        pixmaps/toolbar/visu.png \
        pixmaps/toolbar/volume-high.png \
@@ -157,7 +169,8 @@ DEPS_res = \
        pixmaps/types/type_node.png \
        pixmaps/types/type_playlist.png \
        pixmaps/types/type_unknown.xpm \
-       pixmaps/update.png
+       pixmaps/update.png \
+       pixmaps/lock.png
 
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
 
@@ -180,6 +193,7 @@ SOURCES_qt4 =       qt4.cpp \
                main_interface.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
+               actions_manager.cpp \
                recents.cpp \
                dialogs/playlist.cpp \
                dialogs/bookmarks.cpp \
@@ -188,12 +202,15 @@ SOURCES_qt4 =     qt4.cpp \
                dialogs/extended.cpp \
                dialogs/messages.cpp \
                dialogs/errors.cpp \
-               dialogs/interaction.cpp \
+               dialogs/external.cpp \
+               dialogs/plugins.cpp \
                dialogs/sout.cpp \
+               dialogs/convert.cpp \
                dialogs/help.cpp \
                dialogs/gototime.cpp \
                dialogs/toolbar.cpp \
                dialogs/open.cpp \
+               dialogs/openurl.cpp \
                dialogs/vlm.cpp \
                dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
@@ -204,11 +221,14 @@ SOURCES_qt4 =     qt4.cpp \
                components/open_panels.cpp \
                components/interface_widgets.cpp \
                components/controller.cpp \
+               components/controller_widget.cpp \
                components/playlist/playlist_model.cpp \
                components/playlist/playlist_item.cpp \
                components/playlist/standardpanel.cpp \
                components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
+               components/sout/profile_selector.cpp \
+               components/sout/sout_widgets.cpp \
                util/input_slider.cpp \
                util/customwidgets.cpp \
                util/registry.cpp
@@ -219,6 +239,7 @@ noinst_HEADERS = \
        main_interface.hpp \
        dialogs_provider.hpp \
        input_manager.hpp \
+       actions_manager.hpp \
        recents.hpp \
        dialogs/playlist.hpp \
        dialogs/bookmarks.hpp \
@@ -226,13 +247,16 @@ noinst_HEADERS = \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
        dialogs/errors.hpp \
+       dialogs/external.hpp \
+       dialogs/plugins.hpp \
        dialogs/preferences.hpp \
-       dialogs/interaction.hpp \
        dialogs/sout.hpp \
+       dialogs/convert.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/toolbar.hpp \
        dialogs/open.hpp \
+       dialogs/openurl.hpp \
        dialogs/vlm.hpp \
        dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
@@ -243,16 +267,21 @@ noinst_HEADERS = \
        components/open_panels.hpp \
        components/interface_widgets.hpp \
        components/controller.hpp \
+       components/controller_widget.hpp \
        components/playlist/playlist_model.hpp \
        components/playlist/playlist_item.hpp \
        components/playlist/panels.hpp \
        components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        components/playlist/sorting.h \
+       components/sout/profile_selector.hpp \
+       components/sout/sout_widgets.hpp \
+       components/sout/profiles.hpp \
        util/input_slider.hpp \
        util/customwidgets.hpp \
        util/qvlcframe.hpp \
        util/qvlcapp.hpp \
+       util/qt_dirs.hpp \
        util/registry.hpp
 
 EXTRA_DIST += \
@@ -266,6 +295,7 @@ EXTRA_DIST += \
        ui/open_capture.ui \
        ui/open.ui \
        ui/podcast_configuration.ui \
+       ui/profiles.ui \
        ui/sprefs_audio.ui \
        ui/sprefs_input.ui \
        ui/sprefs_interface.ui \