mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 09:42:19 +00:00
configure/qt: Fix build without Qt5X11Extras
This commit is contained in:
parent
a6507de48e
commit
7cb734b1cd
2 changed files with 5 additions and 4 deletions
|
@ -2615,7 +2615,8 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
|
||||||
else
|
else
|
||||||
HAVE_QT="yes"
|
HAVE_QT="yes"
|
||||||
PKG_CHECK_MODULES(QT_X11, Qt5X11Extras, [
|
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"
|
QT_LIBS="$QT_LIBS $QT_X11_LIBS"
|
||||||
AC_SUBST([QT_CFLAGS])
|
AC_SUBST([QT_CFLAGS])
|
||||||
AC_SUBST([QT_LIBS])
|
AC_SUBST([QT_LIBS])
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "qtitem.h"
|
#include "qtitem.h"
|
||||||
#include "gstqsgtexture.h"
|
#include "gstqsgtexture.h"
|
||||||
|
|
||||||
#if GST_GL_HAVE_WINDOW_X11
|
#if GST_GL_HAVE_WINDOW_X11 && defined (HAVE_QT_X11)
|
||||||
#include <QX11Info>
|
#include <QX11Info>
|
||||||
#include <gst/gl/x11/gstgldisplay_x11.h>
|
#include <gst/gl/x11/gstgldisplay_x11.h>
|
||||||
#include <gst/gl/x11/gstglcontext_glx.h>
|
#include <gst/gl/x11/gstglcontext_glx.h>
|
||||||
|
@ -111,7 +111,7 @@ QtGLVideoItem::QtGLVideoItem()
|
||||||
|
|
||||||
g_mutex_init (&this->priv->lock);
|
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())
|
if (QString::fromUtf8 ("xcb") == app->platformName())
|
||||||
this->priv->display = (GstGLDisplay *)
|
this->priv->display = (GstGLDisplay *)
|
||||||
gst_gl_display_x11_new_with_display (QX11Info::display ());
|
gst_gl_display_x11_new_with_display (QX11Info::display ());
|
||||||
|
@ -259,7 +259,7 @@ QtGLVideoItem::onSceneGraphInitialized ()
|
||||||
return;
|
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)) {
|
if (GST_IS_GL_DISPLAY_X11 (this->priv->display)) {
|
||||||
platform = GST_GL_PLATFORM_GLX;
|
platform = GST_GL_PLATFORM_GLX;
|
||||||
gl_api = gst_gl_context_get_current_gl_api (NULL, NULL);
|
gl_api = gst_gl_context_get_current_gl_api (NULL, NULL);
|
||||||
|
|
Loading…
Reference in a new issue