From c97f5f8c2e91c1b76d42583efaf232487d490060 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Thu, 5 Jan 2012 17:22:19 +1000 Subject: 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 --- src/multimedia/controls/qvideodevicecontrol.cpp | 7 ------- src/multimedia/controls/qvideodevicecontrol.h | 1 - 2 files changed, 8 deletions(-) (limited to 'src/multimedia') 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 @@ -105,13 +105,6 @@ QVideoDeviceControl::~QVideoDeviceControl() \since 1.0 */ -/*! - \fn QVideoDeviceControl::deviceIcon(int index) const - - Returns an icon for the video device at \a index. - \since 1.0 -*/ - /*! \fn QVideoDeviceControl::defaultDevice() const 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; -- cgit v1.2.3