From 5f5587940aefa29f375e49d0c2a450d0119f3681 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 21 Nov 2016 10:51:11 +0100
Subject: [PATCH] Fix mir detection
The old check would have never triggered unless you compiled
with CONFIG+=mir by hand.
Change-Id: I1d418dce09adaedbdff366dfeb8f4036cac0f075
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
src/gsttools/gsttools.pro | 3 +--
src/plugins/gstreamer/common.pri | 4 ----
.../gstreamer/mediaplayer/qgstreamerplayerservice.cpp | 5 +++--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index fab9bd408..e84454980 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -88,14 +88,13 @@ qtConfig(gstreamer_0_10) {
qgstvideorenderersink.cpp
}
-mir: {
+qtConfig(mirclient): {
qtConfig(opengles2):qtHaveModule(widgets) {
PRIVATE_HEADERS += qgstreamermirtexturerenderer_p.h
SOURCES += qgstreamermirtexturerenderer.cpp
QT += opengl quick
LIBS += -lEGL
}
- DEFINES += HAVE_MIR
}
qtConfig(gstreamer_app) {
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri
index 7faf9b111..110bc8549 100644
--- a/src/plugins/gstreamer/common.pri
+++ b/src/plugins/gstreamer/common.pri
@@ -9,10 +9,6 @@ LIBS += -lqgsttools_p
QMAKE_USE += gstreamer
-mir: {
- DEFINES += HAVE_MIR
-}
-
qtConfig(resourcepolicy) {
QMAKE_USE += libresourceqt5
DEFINES += HAVE_RESOURCE_POLICY
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
index ed88821c7..2c2de1bbc 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
@@ -37,6 +37,7 @@
**
****************************************************************************/
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
#include <QtCore/qvariant.h>
#include <QtCore/qdebug.h>
@@ -56,7 +57,7 @@
#include <private/qgstreamervideowindow_p.h>
#include <private/qgstreamervideorenderer_p.h>
-#if defined(HAVE_MIR) && defined (__arm__)
+#if QT_CONFIG(mirclient) && defined (__arm__)
#include "private/qgstreamermirtexturerenderer_p.h"
#endif
@@ -88,7 +89,7 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
m_streamsControl = new QGstreamerStreamsControl(m_session,this);
m_availabilityControl = new QGStreamerAvailabilityControl(m_control->resources(), this);
-#if defined(HAVE_MIR) && defined (__arm__)
+#if QT_CONFIG(mirclient) && defined (__arm__)
m_videoRenderer = new QGstreamerMirTextureRenderer(this, m_session);
#else
m_videoRenderer = new QGstreamerVideoRenderer(this);
--
GitLab