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

Reverts [24530] & [24531] (preprocessing related) , add $(DEFS) (-DHAVE_CONFIG_H) to moc command line

modules/gui/qt4/Modules.am

@@ -71,7 +71,7 @@ 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

modules/gui/qt4/components/simple_preferences.hpp

@@ -116,7 +116,7 @@ private:
 private slots:
     void lastfm_Changed( int );
     void updateAudioOptions( int ); 
-#ifdef SYS_MINGW32
+#ifdef WIN32
     void assoDialog();
     void saveAsso();
 #endif

modules/gui/qt4/dialogs/help.hpp

@@ -24,7 +24,9 @@
 #ifndef _HELP_DIALOG_H_
 #define _HELP_DIALOG_H_
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "util/qvlcframe.hpp"
 

modules/gui/qt4/dialogs/vlm.hpp

@@ -25,14 +25,16 @@
 #ifndef _VLM_DIALOG_H_
 #define _VLM_DIALOG_H_
 
+#ifdef HAVE_CONFIG_H
 # include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 
-#include <vlc_vlm.h>
-
 #ifdef ENABLE_VLM
 
+#include <vlc_vlm.h>
+
 #include "ui/vlm.h"
 #include "util/qvlcframe.hpp"