From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Sat, 19 Jan 2019 14:07:44 +0000 (+0100)
Subject: qmlgl: qmake: fix building for android
X-Git-Tag: 1.19.3~509^2~1210
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d75284cd83c8a59fe413d8ade9fe913a364ff382;p=platform%2Fupstream%2Fgstreamer.git

qmlgl: qmake: fix building for android
---

diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
index 82f4983..20e8ead 100644
--- a/ext/qt/gstqtglutility.cc
+++ b/ext/qt/gstqtglutility.cc
@@ -35,7 +35,7 @@
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
-#if GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_EGLFS)
+#if GST_GL_HAVE_PLATFORM_EGL && (defined (HAVE_QT_EGLFS) || defined (HAVE_QT_ANDROID))
 #if GST_GL_HAVE_WINDOW_VIV_FB
 #include <qpa/qplatformnativeinterface.h>
 #include <gst/gl/viv-fb/gstgldisplay_viv_fb.h>
@@ -189,6 +189,8 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
     platform = GST_GL_PLATFORM_EAGL;
 #elif GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32)
     platform = GST_GL_PLATFORM_WGL;
+#elif GST_GL_HAVE_WINDOW_ANDROID && GST_GL_HAVE_PLATFORM_EGL && defined (HAVE_QT_ANDROID)
+    platform = GST_GL_PLATFORM_EGL;
 #else
     GST_ERROR ("Unknown platform");
     return FALSE;
diff --git a/ext/qt/qtplugin.pro b/ext/qt/qtplugin.pro
index 2337087..c30fd6d 100644
--- a/ext/qt/qtplugin.pro
+++ b/ext/qt/qtplugin.pro
@@ -5,15 +5,20 @@ TARGET = gstqmlgl
 QT += qml quick widgets gui
 
 QT_CONFIG -= no-pkg-config
-CONFIG += link_pkgconfig debug plugin
+CONFIG += link_pkgconfig debug
 PKGCONFIG = \
     gstreamer-1.0 \
     gstreamer-video-1.0 \
     gstreamer-gl-1.0
 
-DEFINES += \
-    GST_USE_UNSTABLE_API \
-    HAVE_QT_WIN32
+android {
+    CONFIG += static
+} else {
+    CONFIG += plugin
+}
+
+android:DEFINES += HAVE_QT_ANDROID
+win32:DEFINES += HAVE_QT_WIN32
 
 SOURCES += \
     gstplugin.cc \
@@ -37,4 +42,3 @@ INCLUDEPATH += \
     $$(GSTREAMER_ROOT)/include \
     $$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/
 
-