[vlc-devel] commit: Qt4: check for Windows window system backend rather than platform ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec  8 18:35:54 2009 +0200| [3b4b253f83e470abea405ba5121f873967b5a80e] | committer: Rémi Denis-Courmont 

Qt4: check for Windows window system backend rather than platform

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

 modules/gui/qt4/qt4.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 92b4672..a638fb3 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -243,11 +243,11 @@ vlc_module_begin ()
 
         set_callbacks( OpenDialogs, Close )
 
-#if defined(Q_WS_X11) || defined(WIN32)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN)
     add_submodule ()
 #if defined(Q_WS_X11)
         set_capability( "vout window xid", 50 )
-#elif defined(WIN32)
+#elif defined(Q_WS_WIN)
         set_capability( "vout window hwnd", 50 )
 #endif
         set_callbacks( WindowOpen, WindowClose )
@@ -532,10 +532,12 @@ static int WindowOpen( vlc_object_t *p_obj )
     if( !p_wnd->xid )
         return VLC_EGENERIC;
 
-#elif defined (WIN32)
+#elif defined (Q_WS_WIN)
     p_wnd->hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
     if( !p_wnd->hwnd )
         return VLC_EGENERIC;
+#else
+# error FIXME
 #endif
 
     p_wnd->control = WindowControl;