Skip to content

V
vlc-2-2
Commit d4485d3f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: simplify Win32 and Mac detection

parent 1ad673fb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/gui/qt4/qt4.cpp
View file @ d4485d3f
...@@ -303,13 +303,12 @@ vlc_module_begin () ...@@ -303,13 +303,12 @@ vlc_module_begin ()
set_capability( "vout window xid", 0 ) set_capability( "vout window xid", 0 )
set_callbacks( WindowOpen, WindowClose ) set_callbacks( WindowOpen, WindowClose )
#endif #endif
#if defined (Q_WS_WIN) || (defined (Q_WS_QPA) && defined (_WIN32)) \ #if (defined (Q_OS_WIN) && !defined (_WIN32_X11_)) || defined (Q_OS_OS2)
|| defined (Q_WS_PM) || (defined (Q_WS_QPA) && defined (__OS2__))
add_submodule () add_submodule ()
set_capability( "vout window hwnd", 0 ) set_capability( "vout window hwnd", 0 )
set_callbacks( WindowOpen, WindowClose ) set_callbacks( WindowOpen, WindowClose )
#endif #endif
#if defined (Q_WS_MAC) || (defined (Q_WS_QPA) && defined (__APPLE__)) #if defined (Q_OS_DARWIN)
add_submodule () add_submodule ()
set_capability( "vout window nsobject", 0 ) set_capability( "vout window nsobject", 0 )
set_callbacks( WindowOpen, WindowClose ) set_callbacks( WindowOpen, WindowClose )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment