[vlc-commits] qt: vlm: Do not rely on config.h defines when generating moc

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 27 18:53:16 2018 +0200| [11da152be000a872271caf539f31f0f843b39135] | committer: Hugo Beauzée-Luyssen

qt: vlm: Do not rely on config.h defines when generating moc

This causes recent moc versions to consider the file empty, thus not
generating anything.

(cherry picked from commit 3992b33665cd3d246dff366454cd93dd3e51a697)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=11da152be000a872271caf539f31f0f843b39135
---

 modules/gui/qt/dialogs/vlm.cpp | 3 +--
 modules/gui/qt/dialogs/vlm.hpp | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index 383140ced2..e88cc63caa 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -27,9 +27,8 @@
 # include "config.h"
 #endif
 
-#include "dialogs/vlm.hpp"
-
 #ifdef ENABLE_VLM
+#include "dialogs/vlm.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs/sout.hpp"
 #include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/dialogs/vlm.hpp b/modules/gui/qt/dialogs/vlm.hpp
index 25d022ed82..2983115c14 100644
--- a/modules/gui/qt/dialogs/vlm.hpp
+++ b/modules/gui/qt/dialogs/vlm.hpp
@@ -29,8 +29,6 @@
 # include "config.h"
 #endif
 
-#ifdef ENABLE_VLM
-
 #include <vlc_vlm.h>
 
 #include "ui/vlm.h"
@@ -226,5 +224,3 @@ private:
 };
 
 #endif
-
-#endif