]> git.sesse.net Git - vlc/commitdiff
Qt4: check for Windows window system backend rather than platform
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 8 Dec 2009 16:35:54 +0000 (18:35 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 8 Dec 2009 20:04:41 +0000 (22:04 +0200)
modules/gui/qt4/qt4.cpp

index 92b4672614118bfb42cd7d3b827c482d79ca1cc4..a638fb31f355dbfc376f2680cd210f6dccb5b068 100644 (file)
@@ -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;