diff -r ce961d2c008b -r 6745d806c5ff qtmobility/src/multimedia/qvideowidgetcontrol.cpp --- a/qtmobility/src/multimedia/qvideowidgetcontrol.cpp Mon Jun 21 22:38:54 2010 +0100 +++ b/qtmobility/src/multimedia/qvideowidgetcontrol.cpp Thu Jul 22 16:42:52 2010 +0100 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -51,28 +51,29 @@ \brief The QVideoWidgetControl class provides a media control which implements a video widget. - \ingroup multimedia-serv + \ingroup multimedia - The videoWidget() property of QVideoWidgetControl provides a pointer to - a video widget implemented by the control's media service. This widget - is owned by the media service and so care should be taken not to delete it. + The videoWidget() property of QVideoWidgetControl provides a pointer to a + video widget implemented by the control's media service. This widget is + owned by the media service and so care should be taken not to delete it. \code - QVideoWidgetControl *widgetControl = mediaService->control(); + QVideoWidgetControl *widgetControl = mediaService->requestControl(); layout->addWidget(widgetControl->widget()); \endcode - QVideoWidgetControl is one of number of possible video output controls, - in order to receive video it must be made the active video output - control by setting the output property of QVideoOutputControl to \l {QVideoOutputControl::WidgetOutput}{WidgetOutput}. Consequently any + QVideoWidgetControl is one of number of possible video output controls, in + order to receive video it must be made the active video output control by + setting the output property of QVideoOutputControl to \l + {QVideoOutputControl::WidgetOutput}{WidgetOutput}. Consequently any QMediaService that implements QVideoWidgetControl must also implement QVideoOutputControl. The interface name of QVideoWidgetControl is \c com.nokia.Qt.QVideoWidgetControl/1.0 as defined in QVideoWidgetControl_iid. - \sa QMediaService::control(), QVideoOutputControl, QVideoWidget + \sa QMediaService::requestControl(), QVideoOutputControl, QVideoWidget */ /*!