From 7cb734b1cd2809a301c5a58a664d61ab4347d0a6 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Fri, 10 Jul 2015 14:01:43 +0200
Subject: [PATCH] configure/qt: Fix build without Qt5X11Extras

---
 configure.ac     | 3 ++-
 ext/qt/qtitem.cc | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index da85065..ce6f572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2615,7 +2615,8 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
       else
         HAVE_QT="yes"
         PKG_CHECK_MODULES(QT_X11, Qt5X11Extras, [
-            QT_CFLAGS="$QT_CFLAGS $QT_X11_CFLAGS"
+	AC_DEFINE([HAVE_QT_X11], [], [Define if Qt X11 integration is installed])
+	    QT_CFLAGS="$QT_CFLAGS $QT_X11_CFLAGS"
             QT_LIBS="$QT_LIBS $QT_X11_LIBS"
             AC_SUBST([QT_CFLAGS])
             AC_SUBST([QT_LIBS])
diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
index 5a7ac2e..fab2c5d 100644
--- a/ext/qt/qtitem.cc
+++ b/ext/qt/qtitem.cc
@@ -31,7 +31,7 @@
 #include "qtitem.h"
 #include "gstqsgtexture.h"
 
-#if GST_GL_HAVE_WINDOW_X11
+#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
 #include <QX11Info>
 #include <gst/gl/x11/gstgldisplay_x11.h>
 #include <gst/gl/x11/gstglcontext_glx.h>
@@ -111,7 +111,7 @@ QtGLVideoItem::QtGLVideoItem()
 
   g_mutex_init (&this->priv->lock);
 
-#if GST_GL_HAVE_WINDOW_X11
+#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
   if (QString::fromUtf8 ("xcb") == app->platformName())
     this->priv->display = (GstGLDisplay *)
         gst_gl_display_x11_new_with_display (QX11Info::display ());
@@ -259,7 +259,7 @@ QtGLVideoItem::onSceneGraphInitialized ()
     return;
   }
 
-#if GST_GL_HAVE_WINDOW_X11
+#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
   if (GST_IS_GL_DISPLAY_X11 (this->priv->display)) {
     platform = GST_GL_PLATFORM_GLX;
     gl_api = gst_gl_context_get_current_gl_api (NULL, NULL);
-- 
2.7.4