Reverts [24530] & [24531] (preprocessing related) , add $(DEFS) (-DHAVE_CONFIG_H...

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 69b4b6b3df5a7ecebd4955cf7898755f5f489a38..af90ecba2306f3ac1f618289a740b550a4b59e4c 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -17,8 +17,8 @@ nodist_SOURCES_qt4 = \
                menus.moc.cpp \
                dialogs_provider.moc.cpp \
                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 \
@@ -38,6 +38,7 @@ nodist_SOURCES_qt4 = \
                components/simple_preferences.moc.cpp \
                components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
+               components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
@@ -70,13 +71,13 @@ resources.cpp: res.qrc
        $(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        mkdir -p -- ui
        rm -f $@ $@.tmp
        echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
-       $(UIC) -tr "Q_" $< | grep -v setObjectName | grep -v objectName >> $@.tmp
+       $(UIC) -tr "Q_" $< >> $@.tmp
        sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        rm -f $@.tmp
 
@@ -85,8 +86,8 @@ SOURCES_qt4 =         qt4.cpp \
                main_interface.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
-               playlist_model.cpp \
                dialogs/playlist.cpp \
+               dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
                dialogs/mediainfo.cpp \
                dialogs/extended.cpp \
@@ -106,11 +107,13 @@ SOURCES_qt4 =     qt4.cpp \
                components/simple_preferences.cpp \
                components/open_panels.cpp \
                components/interface_widgets.cpp \
+               components/playlist/playlist_model.cpp \
                components/playlist/standardpanel.cpp \
                components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
                util/input_slider.cpp \
-               util/customwidgets.cpp
+               util/customwidgets.cpp \
+               util/registry.cpp
 
 noinst_HEADERS = \
        qt4.hpp \
@@ -118,8 +121,8 @@ noinst_HEADERS = \
        main_interface.hpp \
        dialogs_provider.hpp \
        input_manager.hpp \
-       playlist_model.hpp \
        dialogs/playlist.hpp \
+       dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
@@ -139,13 +142,14 @@ noinst_HEADERS = \
        components/simple_preferences.hpp \
        components/open_panels.hpp \
        components/interface_widgets.hpp \
+       components/playlist/playlist_model.hpp \
        components/playlist/panels.hpp \
        components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        util/input_slider.hpp \
-       util/directslider.hpp \
        util/customwidgets.hpp \
-       util/qvlcframe.hpp
+       util/qvlcframe.hpp \
+       util/registry.cpp
 
 EXTRA_DIST += \
        res.qrc \
@@ -224,6 +228,7 @@ EXTRA_DIST += \
        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-slider.svg \