From 8c73595c023d41ec832a34988116d380a08955f8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Feb 2015 14:35:55 +0100 Subject: [PATCH] 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 --- src/multimedia/qmediaserviceprovider.cpp | 6 +++--- 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 fe372ac5..563af846 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 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 f26d3c34..ccfe9ccd 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),