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/multimedia | |
| 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/multimedia')
| -rw-r--r-- | src/multimedia/controls/qvideodevicecontrol.cpp | 7 | ||||
| -rw-r--r-- | src/multimedia/controls/qvideodevicecontrol.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp index a864fd580..e352eafd6 100644 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ b/src/multimedia/controls/qvideodevicecontrol.cpp @@ -106,13 +106,6 @@ QVideoDeviceControl::~QVideoDeviceControl() */ /*! - \fn QVideoDeviceControl::deviceIcon(int index) const - - Returns an icon for the video device at \a index. - \since 1.0 -*/ - -/*! \fn QVideoDeviceControl::defaultDevice() const Returns the index of the default video device. diff --git a/src/multimedia/controls/qvideodevicecontrol.h b/src/multimedia/controls/qvideodevicecontrol.h index 6f44c4671..9fc247e01 100644 --- a/src/multimedia/controls/qvideodevicecontrol.h +++ b/src/multimedia/controls/qvideodevicecontrol.h @@ -61,7 +61,6 @@ public: virtual QString deviceName(int index) const = 0; virtual QString deviceDescription(int index) const = 0; - virtual QIcon deviceIcon(int index) const = 0; virtual int defaultDevice() const = 0; virtual int selectedDevice() const = 0; |