diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-05 17:22:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 05:26:01 +0100 |
| commit | c97f5f8c2e91c1b76d42583efaf232487d490060 (patch) | |
| tree | 533f1142282ebce38bbf7bd4356b4341530f30be /src/plugins/gstreamer/camerabin/camerabinservice.h | |
| parent | bc7d964a053a3a37a0b286ee17ee15c9ef747c3e (diff) | |
Properly handle the case where QtWidgets is not available.
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinservice.h')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinservice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.h b/src/plugins/gstreamer/camerabin/camerabinservice.h index 5513dd80e..dd8ceba87 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.h +++ b/src/plugins/gstreamer/camerabin/camerabinservice.h @@ -79,7 +79,7 @@ private: void setAudioPreview(GstElement*); CameraBinSession *m_captureSession; - CameraBinControl *m_cameraControl; + CameraBinControl *m_cameraControl; CameraBinMetaData *m_metaDataControl; QAudioEndpointSelector *m_audioInputEndpointSelector; @@ -88,8 +88,10 @@ private: QMediaControl *m_videoOutput; QMediaControl *m_videoRenderer; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) QMediaControl *m_videoWindow; QGstreamerVideoWidgetControl *m_videoWidgetControl; +#endif CameraBinImageCapture *m_imageCaptureControl; }; |