diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index fab9bd408b08465f2bda02021f03b6c0c1e36d69..e844549807af3190972984bae1aa0007c411f41f 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 7faf9b1115bc522a44224d07a7182a6c17865530..110bc854923213d54e32b5fb97f0bb5dbe0f8db4 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 ed88821c7d0d30d91d9f22c8b55a32695fdfbc2c..2c2de1bbca9d1b90cef1697c344c8b2ea7d3a972 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);