Qt: rebase about dialog on Qtcreator

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 0b8cb905ed7393c4e3ed1cc6dd4454dc6f68e0a3..55ad347e14d1dde6cf59f098628fa84bf2fc6517 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -85,6 +85,8 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
                ui/streampanel.h \
+               ui/messages_panel.h \
+               ui/about.h \
                ui/sout.h
 
 DEPS_res = \
@@ -183,6 +185,10 @@ DEPS_res = \
        pixmaps/types/type_node.png \
        pixmaps/types/type_playlist.png \
        pixmaps/types/type_unknown.xpm \
+       pixmaps/win7/win7thumbnail_pause.png \
+       pixmaps/win7/win7thumbnail_prev.png \
+       pixmaps/win7/win7thumbnail_next.png \
+       pixmaps/win7/win7thumbnail_play.png \
        pixmaps/update.png \
        pixmaps/lock.png
 
@@ -202,7 +208,7 @@ resources.cpp: vlc.qrc $(DEPS_res)
        $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        $(AM_V_at)mkdir -p -- ui
@@ -309,7 +315,7 @@ noinst_HEADERS = \
        components/interface_widgets.hpp \
        components/controller.hpp \
        components/controller_widget.hpp \
-       components/epg/EPGChannels.hpp \        
+       components/epg/EPGChannels.hpp \
        components/epg/EPGEvent.hpp \
        components/epg/EPGItem.hpp \
        components/epg/EPGRuler.hpp \
@@ -352,6 +358,8 @@ EXTRA_DIST += \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
+       ui/messages_panel.ui \
+       ui/about.ui \
        ui/sout.ui \
        ui/vlm.ui \
        $(DEPS_res)