Camerabin backend: fixed compilation without X11
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Wed, 14 Sep 2011 02:31:24 +0000 (12:31 +1000)
committerQt by Nokia <qt-info@nokia.com>
Sat, 17 Sep 2011 05:32:37 +0000 (07:32 +0200)
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 <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
src/plugins/gstreamer/camerabin/camerabinservice.cpp

index 74fb40c..3c994b0 100644 (file)
@@ -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) {