[vlc-commits] Qt: simplify Win32 and Mac detection

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May 22 14:56:27 2014 +0200| [d4485d3f17123e2e747a6d0c68c7eb9643ea4a2a] | committer: Jean-Baptiste Kempf

Qt: simplify Win32 and Mac detection

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

 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..0cadace 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 (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_WS_MAC) || (defined (Q_WS_QPA) && defined (__APPLE__))
+#if defined (Q_OS_DARWIN)
     add_submodule ()
         set_capability( "vout window nsobject", 0 )
         set_callbacks( WindowOpen, WindowClose )