From 399500f87e29e6132902cba9e1e372fa8b49bb51 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:47:49 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- src/multimedia/doc/src/audioengineoverview.qdoc | 2 +- src/multimedia/doc/src/audiooverview.qdoc | 2 +- src/multimedia/doc/src/cameraoverview.qdoc | 2 +- src/multimedia/doc/src/changes.qdoc | 2 +- src/multimedia/doc/src/multimedia.qdoc | 2 +- src/multimedia/doc/src/multimediabackend.qdoc | 2 +- src/multimedia/doc/src/plugins/qml-multimedia.qdoc | 2 +- src/multimedia/doc/src/qtmultimedia-cpp.qdoc | 2 +- src/multimedia/doc/src/qtmultimedia-examples.qdoc | 2 +- src/multimedia/doc/src/qtmultimedia-index.qdoc | 2 +- src/multimedia/doc/src/qtmultimedia5.qdoc | 2 +- src/multimedia/doc/src/radiooverview.qdoc | 2 +- src/multimedia/doc/src/videooverview.qdoc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/multimedia/doc/src') diff --git a/src/multimedia/doc/src/audioengineoverview.qdoc b/src/multimedia/doc/src/audioengineoverview.qdoc index 37f53ce8e..c3bf793a5 100644 --- a/src/multimedia/doc/src/audioengineoverview.qdoc +++ b/src/multimedia/doc/src/audioengineoverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc index 20c5342e8..8d9ef19dc 100644 --- a/src/multimedia/doc/src/audiooverview.qdoc +++ b/src/multimedia/doc/src/audiooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index 40c82a69a..2094b9571 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc index aa4069261..10e9d92b8 100644 --- a/src/multimedia/doc/src/changes.qdoc +++ b/src/multimedia/doc/src/changes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 5afa9f6a1..801305eee 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/multimediabackend.qdoc b/src/multimedia/doc/src/multimediabackend.qdoc index adab2b802..68159d340 100644 --- a/src/multimedia/doc/src/multimediabackend.qdoc +++ b/src/multimedia/doc/src/multimediabackend.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc index 594c77960..e6569c487 100644 --- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc +++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc index 938ffc3cb..dcc86c354 100644 --- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc index 4427e16f3..257e7af7c 100644 --- a/src/multimedia/doc/src/qtmultimedia-examples.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index e7838cfd8..60e4cfbb4 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index 1c11e0151..bbf9907f6 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/radiooverview.qdoc b/src/multimedia/doc/src/radiooverview.qdoc index 1d19933fb..22d2ebbde 100644 --- a/src/multimedia/doc/src/radiooverview.qdoc +++ b/src/multimedia/doc/src/radiooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index 45ea87f09..9fa55f7d7 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. -- cgit v1.2.3 From 51334d299520118bbbc077696ca589f972a2f2ea Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Thu, 3 Jan 2013 17:50:32 +0100 Subject: Doc: Fixed random QDoc warnings - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols Reviewed-by: Jerome Pasion --- src/multimedia/doc/src/cameraoverview.qdoc | 11 +++++++---- src/multimedia/doc/src/multimedia.qdoc | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src/multimedia/doc/src') diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index 2094b9571..71515ab19 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -104,14 +104,17 @@ In QML, you can use \l Camera and \l VideoOutput together to show a simple viewfinder: \qml +import QtQuick 2.0 +import QtMultimedia 5.0 + +VideoOutput { + source: camera + Camera { id: camera // You can adjust various settings in here } - - VideoOutput { - source: camera - } +} \endqml In C++, your choice depends on whether you are using widgets, or QGraphicsView. diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 801305eee..6e3606044 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -176,14 +176,14 @@ change when porting code. \section2 QML Types The following types are accessed by using: -\qml +\code import QtMultimedia 5.0 -\endqml +\endcode \annotatedlist multimedia_qml The following types are accessed by using \l {Positional Audio} {QtAudioEngine}: -\qml +\code import QtAudioEngine 1.0 -\endqml +\endcode \annotatedlist multimedia_audioengine \section2 Multimedia Classes -- cgit v1.2.3 From 28ee5b12ff800ff25dd646730011f2d8d4ad9699 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 27 Jan 2013 12:25:02 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp Reviewed-by: Jerome Pasion --- src/multimedia/doc/src/blackberry.qdoc | 6 +++--- src/multimedia/doc/src/plugins/qml-multimedia.qdoc | 2 +- src/multimedia/doc/src/qtmultimedia-cpp.qdoc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/multimedia/doc/src') diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc index 2599bb560..ca35745a3 100644 --- a/src/multimedia/doc/src/blackberry.qdoc +++ b/src/multimedia/doc/src/blackberry.qdoc @@ -30,7 +30,7 @@ \title BlackBerry \brief Platform notes for the BlackBerry Platform -QtMultimedia supports BlackBerry devices that run the BB10 operating system. +Qt Multimedia supports BlackBerry devices that run the BB10 operating system. This page covers the availibility of different features on BB10. \section1 Implementation @@ -41,7 +41,7 @@ and video playback is \e mmrenderer. For low-latency output of raw audio samples three-dimensional positional audio playback, \e OpenAL is supported and present on BB10. -The QtMultimedia BlackBerry backend uses mmrenderer for media playback. +The Qt Multimedia BlackBerry backend uses mmrenderer for media playback. For the positional audio classes in the \l {Positional Audio} {QtAudioEngine} QML module, OpenAL is used as on all other platforms. @@ -54,7 +54,7 @@ Since the playback is delegated to mmrenderer, the supported formats are the sam mmrenderer. As mmrenderer supports streaming from HTTP and other URLs, this is supported in QMediaPlayer as well. Playlists as sources are also supported. -mmrenderer does not allow access to the pixel data of video frames, hence QtMultimedia +mmrenderer does not allow access to the pixel data of video frames, hence Qt Multimedia classes like QVideoFrame and QAbstractVideoSurface will not work since they require access to the image data. QVideoWidget and the VideoOutput QML element are implemented with an overlay window; mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application. diff --git a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc index e6569c487..e1e5f8a64 100644 --- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc +++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc @@ -48,7 +48,7 @@ \section2 Audio \l Audio is an easy way to add audio playback to a Qt Quick - scene. QtMultimedia provides properties for control, methods (functions) and signals. + scene. Qt Multimedia provides properties for control, methods (functions) and signals. The code extract below shows the creation and use of an Audio instance. diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc index dcc86c354..3405143e5 100644 --- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc @@ -30,7 +30,7 @@ \title Qt Multimedia C++ Classes \ingroup modules - \brief The \l {Qt Multimedia}{QtMultimedia} module provides audio, video, radio and camera functionality. + \brief The \l {Qt Multimedia} module provides audio, video, radio and camera functionality. The C++ classes provide more control over the multimedia content than the QML alternatives. If your application is serving complex use cases such as decoding media files, accessing video or audio buffers, -- cgit v1.2.3