From aef6b5a38a8b44c7bf3b8968018052c59a8d33a4 Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Wed, 14 Sep 2011 12:31:24 +1000 Subject: [PATCH] Camerabin backend: fixed compilation without X11 Disable video widget and overlay controls on systems without X11 Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00 Reviewed-on: http://codereview.qt-project.org/4850 Reviewed-by: Qt Sanity Bot Reviewed-by: derick hawcroft --- src/plugins/gstreamer/camerabin/camerabinservice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index 74fb40cb..3c994b0f 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -114,6 +114,7 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_videoRenderer = new QGstreamerVideoRenderer(this); #endif +#if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO) #ifdef Q_WS_MAEMO_6 m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink"); @@ -124,6 +125,8 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); +#endif + } if (!m_captureSession) {