Typo

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 4358bf5ce5b69dea80e79e81b10a3bede73ae013..6666a146781953b5c19ef994d1a7d85aa753c03f 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -19,6 +19,7 @@ nodist_SOURCES_qt4 = \
                input_manager.moc.cpp \
                playlist_model.moc.cpp \
                dialogs/playlist.moc.cpp \
+        dialogs/bookmarks.moc.cpp \
                dialogs/mediainfo.moc.cpp \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
@@ -32,18 +33,20 @@ nodist_SOURCES_qt4 = \
                dialogs/podcast_configuration.moc.cpp \
                dialogs/vlm.moc.cpp \
                components/extended_panels.moc.cpp \
-               components/infopanels.moc.cpp \
+               components/info_panels.moc.cpp \
                components/preferences_widgets.moc.cpp \
                components/complete_preferences.moc.cpp \
                components/simple_preferences.moc.cpp \
-               components/open.moc.cpp \
+               components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
+               components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
                util/input_slider.moc.cpp \
                util/customwidgets.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
+               ui/v4l2.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
@@ -57,7 +60,6 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_interface.h \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
-               ui/sprefs_hotkeys.h \
                ui/streampanel.h \
                ui/sout.h
 
@@ -69,7 +71,7 @@ resources.cpp: res.qrc
        $(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(MOC) -o $@ $<
+       $(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        mkdir -p -- ui
@@ -79,8 +81,6 @@ resources.cpp: res.qrc
        sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        rm -f $@.tmp
 
-dialogs/help.cpp: $(top_builddir)/include/vlc_about.h
-
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
@@ -88,6 +88,7 @@ SOURCES_qt4 =         qt4.cpp \
                input_manager.cpp \
                playlist_model.cpp \
                dialogs/playlist.cpp \
+        dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
                dialogs/mediainfo.cpp \
                dialogs/extended.cpp \
@@ -101,13 +102,14 @@ SOURCES_qt4 =     qt4.cpp \
                dialogs/vlm.cpp \
                dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
-               components/infopanels.cpp \
+               components/info_panels.cpp \
                components/preferences_widgets.cpp \
                components/complete_preferences.cpp \
                components/simple_preferences.cpp \
-               components/open.cpp \
+               components/open_panels.cpp \
                components/interface_widgets.cpp \
                components/playlist/standardpanel.cpp \
+               components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
                util/input_slider.cpp \
                util/customwidgets.cpp
@@ -120,6 +122,7 @@ noinst_HEADERS = \
        input_manager.hpp \
        playlist_model.hpp \
        dialogs/playlist.hpp \
+    dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
@@ -133,13 +136,14 @@ noinst_HEADERS = \
        dialogs/vlm.hpp \
        dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
-       components/infopanels.hpp \
+       components/info_panels.hpp \
        components/preferences_widgets.hpp \
        components/complete_preferences.hpp \
        components/simple_preferences.hpp \
-       components/open.hpp \
+       components/open_panels.hpp \
        components/interface_widgets.hpp \
        components/playlist/panels.hpp \
+       components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        util/input_slider.hpp \
        util/directslider.hpp \
@@ -149,6 +153,7 @@ noinst_HEADERS = \
 EXTRA_DIST += \
        res.qrc \
        ui/equalizer.ui \
+       ui/v4l2.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
@@ -159,7 +164,6 @@ EXTRA_DIST += \
        ui/sprefs_audio.ui \
        ui/sprefs_input.ui \
        ui/sprefs_interface.ui \
-       ui/sprefs_hotkeys.ui \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
@@ -180,7 +184,8 @@ EXTRA_DIST += \
        pixmaps/folder-blue_16px.png \
        pixmaps/folder-grey_16px.png \
        pixmaps/go-next.png \
-pixmaps/menus_help_16px.png \
+       pixmaps/harddisk_16px.png \
+       pixmaps/menus_help_16px.png \
        pixmaps/menus_info_16px.png \
        pixmaps/menus_messages_16px.png \
        pixmaps/menus_preferences_16px.png \
@@ -222,5 +227,9 @@ pixmaps/menus_help_16px.png \
        pixmaps/type_playlist.png \
        pixmaps/type_unknown.xpm \
        pixmaps/volume-high.png \
+       pixmaps/volume-medium.png \
        pixmaps/volume-low.png \
-       pixmaps/volume-muted.png 
+       pixmaps/volume-muted.png \
+       pixmaps/volume-slider.svg \
+       pixmaps/volume-slider-inside.png \
+       pixmaps/volume-slider-outside.png