[vlc-devel] [PATCH] Qt: only Win32 can handle "vout window hwnd" type

Jean-Baptiste Kempf jb at videolan.org
Tue May 20 16:51:40 CEST 2014


Same for Mac and "vout window nsobject" type.
And they always support those types.

Note that this does not solve the main issue for Linux (x11 or egl?)
or other fringe cases like Win32.
However this should not introduce regressions.
---
 modules/gui/qt4/qt4.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index fbe7022..b5fda32 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -303,13 +303,12 @@ vlc_module_begin ()
         set_capability( "vout window xid", 0 )
         set_callbacks( WindowOpen, WindowClose )
 #endif
-#if defined (Q_WS_WIN) || (defined (Q_WS_QPA) && defined (_WIN32)) \
- || defined (Q_WS_PM)  || (defined (Q_WS_QPA) && defined (__OS2__))
+#if (defined (_WIN32) && !VLC_WINSTORE_APP) || defined (__OS2__)
     add_submodule ()
         set_capability( "vout window hwnd", 0 )
         set_callbacks( WindowOpen, WindowClose )
 #endif
-#if defined (Q_WS_MAC) || (defined (Q_WS_QPA) && defined (__APPLE__))
+#if defined (__APPLE__)
     add_submodule ()
         set_capability( "vout window nsobject", 0 )
         set_callbacks( WindowOpen, WindowClose )
-- 
1.9.3




More information about the vlc-devel mailing list