diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2011-09-14 12:31:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 07:32:37 +0200 |
| commit | aef6b5a38a8b44c7bf3b8968018052c59a8d33a4 (patch) | |
| tree | 6b8d2db31329a2ccebb13f647cb29ff68ea0ac83 /src/plugins | |
| parent | eedcc340f1c1e8bb09759946a4b2c241e219cc58 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinservice.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index 74fb40cb9..3c994b0ff 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) { |