Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ib250ceecd02291f752b7775f329f0f494c4aed38

2 files changed, 18 insertions, 12 deletions

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 18cf0e927..32166502d 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -57,7 +57,7 @@ Q_LOGGING_CATEGORY(qLcVideo, "qt.multimedia.video")
 
 /*!
     \qmltype VideoOutput
-    \instantiates QDeclarativeVideoOutput
+    //! \instantiates QDeclarativeVideoOutput
     \brief Render video or camera viewfinder.
 
     \ingroup multimedia_qml
@@ -206,6 +206,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source)
             }
 
             m_sourceType = MediaObjectSource;
+#if QT_CONFIG(opengl)
         } else if (metaObject->indexOfProperty("videoSurface") != -1) {
             // Make sure our backend is a QDeclarativeVideoRendererBackend
             m_backend.reset();
@@ -219,6 +220,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source)
             m_source.data()->setProperty("videoSurface",
                                          QVariant::fromValue<QAbstractVideoSurface*>(surface));
             m_sourceType = VideoSurfaceSource;
+#endif
         } else {
             m_sourceType = NoSource;
         }
@@ -247,12 +249,13 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service)
             }
         }
     }
-
+#if QT_CONFIG(opengl)
     if (!backendAvailable) {
         m_backend.reset(new QDeclarativeVideoRendererBackend(this));
         if (m_backend->init(service))
             backendAvailable = true;
     }
+#endif
 
     // QDeclarativeVideoWindowBackend only works when there is a service with a QVideoWindowControl.
     // Without service, the QDeclarativeVideoRendererBackend should always work.
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
index 7c8d07647..cb1f8106b 100644
--- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
+++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
@@ -11,20 +11,23 @@ PRIVATE_HEADERS += \
 
 HEADERS += \
     $$PRIVATE_HEADERS \
-    qdeclarativevideooutput_render_p.h \
-    qdeclarativevideooutput_window_p.h \
-    qsgvideonode_yuv_p.h \
-    qsgvideonode_rgb_p.h \
-    qsgvideonode_texture_p.h
+    qdeclarativevideooutput_window_p.h
 
 SOURCES += \
     qsgvideonode_p.cpp \
     qdeclarativevideooutput.cpp \
-    qdeclarativevideooutput_render.cpp \
-    qdeclarativevideooutput_window.cpp \
-    qsgvideonode_yuv.cpp \
-    qsgvideonode_rgb.cpp \
-    qsgvideonode_texture.cpp
+    qdeclarativevideooutput_window.cpp
+
+qtConfig(opengl) {
+    SOURCES += qdeclarativevideooutput_render.cpp \
+               qsgvideonode_rgb.cpp \
+               qsgvideonode_yuv.cpp \
+               qsgvideonode_texture.cpp
+    HEADERS += qdeclarativevideooutput_render_p.h \
+               qsgvideonode_rgb_p.h \
+               qsgvideonode_yuv_p.h \
+               qsgvideonode_texture_p.h
+}
 
 RESOURCES += \
     qtmultimediaquicktools.qrc