[vlc-commits] Qt: fix breakage on Win32 because of moc versions

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 14 20:25:32 2011 +0200| [146af0bd9ce2c89a5e7325a60daac9d6af6abe76] | committer: Jean-Baptiste Kempf

Qt: fix breakage on Win32 because of moc versions

Consistency? what for?

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=146af0bd9ce2c89a5e7325a60daac9d6af6abe76
---

 modules/gui/qt4/Modules.am                        |    4 ++++
 modules/gui/qt4/components/simple_preferences.hpp |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index bc59fa0..5ad68ce 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -225,8 +225,12 @@ resources.cpp: vlc.qrc $(DEPS_res)
 if HAVE_DARWIN
 	$(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 else
+if HAVE_WIN32
+	$(moc_verbose)$(MOC) -DWIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+else
 	$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 endif
+endif
 
 .ui.h:
 	$(AM_V_at)mkdir -p -- ui
diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 7307a76..1765247 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -133,7 +133,7 @@ private slots:
     void lastfm_Changed( int );
     void updateAudioOptions( int );
     void updateAudioVolume( int );
-#ifdef SYS_MINGW32
+#ifdef WIN32
     void assoDialog();
     void saveAsso();
 #endif