diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-20 14:35:55 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-23 08:57:35 +0000 |
| commit | 8c73595c023d41ec832a34988116d380a08955f8 (patch) | |
| tree | c81cec2cfa0f78850082bb1de7fb74ab18f5b29c | |
| parent | 36e90b6928bf7d48bbea168b9ffc62448f2b10a9 (diff) | |
Fix some qdoc-warnings.
qtmultimedia/src/multimedia/qmediaserviceprovider.cpp:850: warning: Cannot find 'defaultDevice(...)' in '\fn' QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const
qtmultimedia/src/multimedia/qmediaserviceprovider.cpp:850: warning: Cannot find 'defaultDevice(...)' in '\fn' QByteArray QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const
qtmultimedia/src/multimedia/video/qabstractvideofilter.cpp:261: warning: Undocumented parameter 'parent' in QAbstractVideoFilter::QAbstractVideoFilter()
Change-Id: I72bfc1dc7697cd1323cb7aad16539932ace9d8ea
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 6 | ||||
| -rw-r--r-- | src/multimedia/video/qabstractvideofilter.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index fe372ac5f..563af846a 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -850,19 +850,19 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() /*! \since 5.3 - \fn QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const + \fn QByteArray QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const Returns the default device for a \a service type. */ /*! - \fn QMediaServiceSupportedDevicesInterface::devices(const QByteArray &service) const + \fn QList<QByteArray> QMediaServiceSupportedDevicesInterface::devices(const QByteArray &service) const Returns a list of devices available for a \a service type. */ /*! - \fn QMediaServiceSupportedDevicesInterface::deviceDescription(const QByteArray &service, const QByteArray &device) + \fn QString QMediaServiceSupportedDevicesInterface::deviceDescription(const QByteArray &service, const QByteArray &device) Returns the description of a \a device available for a \a service type. */ diff --git a/src/multimedia/video/qabstractvideofilter.cpp b/src/multimedia/video/qabstractvideofilter.cpp index f26d3c341..ccfe9ccdd 100644 --- a/src/multimedia/video/qabstractvideofilter.cpp +++ b/src/multimedia/video/qabstractvideofilter.cpp @@ -259,7 +259,7 @@ QVideoFilterRunnable::~QVideoFilterRunnable() } /*! - Constructs a new QAbstractVideoFilter instance. + Constructs a new QAbstractVideoFilter instance with parent object \a parent. */ QAbstractVideoFilter::QAbstractVideoFilter(QObject *parent) : QObject(parent), |