Merge commit 'origin/1.0-bugfix'

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index bd2b2ea3a1aa8d88eb5a7abbf36b8a4810976326..a863447dd126ff98bcc9b7d3a539d489eaa5027d 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -21,6 +21,7 @@ nodist_SOURCES_qt4 = \
                input_manager.moc.cpp \
                actions_manager.moc.cpp \
                recents.moc.cpp \
+               variables.moc.cpp \
                dialogs/playlist.moc.cpp \
                dialogs/bookmarks.moc.cpp \
                dialogs/mediainfo.moc.cpp \
@@ -30,7 +31,6 @@ nodist_SOURCES_qt4 = \
                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 \
@@ -58,6 +58,7 @@ nodist_SOURCES_qt4 = \
                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 \
@@ -195,6 +196,7 @@ SOURCES_qt4 =       qt4.cpp \
                input_manager.cpp \
                actions_manager.cpp \
                recents.cpp \
+               variables.cpp \
                dialogs/playlist.cpp \
                dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
@@ -204,7 +206,6 @@ SOURCES_qt4 =       qt4.cpp \
                dialogs/errors.cpp \
                dialogs/external.cpp \
                dialogs/plugins.cpp \
-               dialogs/interaction.cpp \
                dialogs/sout.cpp \
                dialogs/convert.cpp \
                dialogs/help.cpp \
@@ -242,6 +243,7 @@ noinst_HEADERS = \
        input_manager.hpp \
        actions_manager.hpp \
        recents.hpp \
+       variables.hpp \
        dialogs/playlist.hpp \
        dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
@@ -251,7 +253,6 @@ noinst_HEADERS = \
        dialogs/external.hpp \
        dialogs/plugins.hpp \
        dialogs/preferences.hpp \
-       dialogs/interaction.hpp \
        dialogs/sout.hpp \
        dialogs/convert.hpp \
        dialogs/help.hpp \