Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3

 Conflicts:
	.qmake.conf

Change-Id: I255dc22dc21d3629a41a8c2ae2076c48b594e626

1 files changed, 4 insertions, 1 deletions

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 18cf0e927..74c83246f 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -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.