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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 48d3cfb74d640c6062f5e901573263c4e341c6c9..af90ecba2306f3ac1f618289a740b550a4b59e4c 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/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

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 47ab94154fc30db6d5db286f76ecb1abdaab1260..f705de552a3632aa53c90639f6ef00ba1a78a5f3 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/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

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index f5fae30e5f43d9b8ba06f75d50cf975e4850342d..e32930ac21ad57740513bccbc301456142cb6c93 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/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"
 

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index 92f02bd21209e9ee7d88d0c32f010cb51e049938..c763cae820e8586f40564bb7155aff570f94c70b 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/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"