projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ceac1b5)
qmlgl: Fix conflicting declaration of type GLsync for non-android
authorIñigo Huguet <inigohuguet@fanamoel.com>
Tue, 17 Jul 2018 06:23:54 +0000 (08:23 +0200)
committerMatthew Waters <matthew@centricular.com>
Wed, 18 Jul 2018 03:57:23 +0000 (13:57 +1000)
https://bugzilla.gnome.org/show_bug.cgi?id=796821

ext/qt/gstqtgl.h patch | blob | history

diff --git a/ext/qt/gstqtgl.h b/ext/qt/gstqtgl.h
index 85aad62..1f204ab 100644 (file)
--- a/ext/qt/gstqtgl.h
+++ b/ext/qt/gstqtgl.h
@@ -29,7 +29,7 @@
 #include <QtGui/qtgui-config.h>
 #endif
 
-#if defined(QT_OPENGL_ES_2) && GST_GL_HAVE_WINDOW_ANDROID
+#if defined(QT_OPENGL_ES_2)
 #define GLsync gst_qt_GLsync
 #include <QOpenGLContext>
 #include <QOpenGLFunctions>
Domain: Multimedia / Media Common;