[vlc-commits] Qt: use platformName() on Qt5 too, like on QPA

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 20 16:25:09 2014 +0200| [7ca27c5e5f3cecd2dfa69a09afdbca5fa8830288] | committer: Jean-Baptiste Kempf

Qt: use platformName() on Qt5 too, like on QPA

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

 modules/gui/qt4/qt4.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index f13039d..fbe7022 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -520,10 +520,14 @@ static void *Thread( void *obj )
 
     /* Check window type from the Qt platform back-end */
     p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_INVALID;
-#if defined (Q_WS_QPA)
+#if defined (Q_WS_QPA) || HAS_QT5
     QString platform = app.platformName();
     if( platform == qfu("xcb") )
         p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_XID;
+    else if( platform == qfu("windows") )
+        p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND;
+    else if( platform == qfu("cocoa" ) )
+        p_intf->p_sys->voutWindowType = VOUT_WINDOW_TYPE_NSOBJECT;
     else
         msg_Err( p_intf, "unknown Qt platform: %s", qtu(platform) );
 #elif defined (Q_WS_X11)