qmlsink: Ensure that at least one windowing system is available
authorNirbheek Chauhan <nirbheek@centricular.com>
Fri, 7 Aug 2015 11:57:48 +0000 (17:27 +0530)
committerTim-Philipp Müller <tim@centricular.com>
Mon, 31 Aug 2015 22:16:07 +0000 (23:16 +0100)
Otherwise, we'll just crash at runtime because the gl context is NULL

https://bugzilla.gnome.org/show_bug.cgi?id=754108

ext/qt/qtitem.cc

index 9e9e287..6f22000 100644 (file)
@@ -37,7 +37,7 @@
 #include <gst/gl/x11/gstglcontext_glx.h>
 #endif
 
-#if GST_GL_HAVE_WINDOW_WAYLAND
+#if GST_GL_HAVE_WINDOW_WAYLAND && defined (HAVE_QT_WAYLAND)
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
@@ -273,7 +273,7 @@ QtGLVideoItem::onSceneGraphInitialized ()
           platform, gl_api);
   }
 #endif
-#if GST_GL_HAVE_WINDOW_WAYLAND
+#if GST_GL_HAVE_WINDOW_WAYLAND && defined (HAVE_QT_WAYLAND)
   if (GST_IS_GL_DISPLAY_WAYLAND (this->priv->display)) {
     platform = GST_GL_PLATFORM_EGL;
     gl_api = gst_gl_context_get_current_gl_api (platform, NULL, NULL);