vlc/vlc-2.2 | branch: master | Rafaël Carré <fun...@videolan.org> | Wed Jul 30 12:16:11 2014 +0200| [760cb7ec214f994f2967c8d07ed1081f8a1b2692] | committer: Jean-Baptiste Kempf
qt4: fix embedding on unix (cherry picked from commit 15d85d8bc2370e31dec315eda804d8196c0acb93) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=760cb7ec214f994f2967c8d07ed1081f8a1b2692 --- modules/gui/qt4/qt4.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index a156366..ea6fd01 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -42,7 +42,7 @@ #include "util/qvlcapp.hpp" /* QVLCApplication definition */ #include "components/playlist/playlist_model.hpp" /* for ~PLModel() */ -#ifdef Q_WS_X11 +#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) #include <vlc_xlib.h> #endif @@ -298,20 +298,18 @@ vlc_module_begin () set_callbacks( OpenDialogs, Close ) -#if defined (Q_WS_X11) || (defined (Q_WS_QPA) && defined (__unix__)) - add_submodule () - set_capability( "vout window xid", 0 ) - set_callbacks( WindowOpen, WindowClose ) -#endif #if (defined (Q_OS_WIN) && !defined (_WIN32_X11_)) || defined (Q_OS_OS2) add_submodule () set_capability( "vout window hwnd", 0 ) set_callbacks( WindowOpen, WindowClose ) -#endif -#if defined (Q_OS_DARWIN) +#elif defined (Q_OS_DARWIN) add_submodule () set_capability( "vout window nsobject", 0 ) set_callbacks( WindowOpen, WindowClose ) +#elif defined (Q_OS_UNIX) + add_submodule () + set_capability( "vout window xid", 0 ) + set_callbacks( WindowOpen, WindowClose ) #endif vlc_module_end () @@ -351,7 +349,7 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; -#ifdef Q_WS_X11 +#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) if( !vlc_xlib_init( p_this ) ) return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
