slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: Fix module name format

Browse Source 
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 <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sze Howe Koh
2013-01-27 12:25:02 +08:00
committed by The Qt Project
parent 52ad3219f0
commit 28ee5b12ff
16 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
View File

@@ -41,7 +41,7 @@
import QtQuick 2.0 import QtQuick 2.0
// Item which is loaded by CameraItem if QtMultimediaKit is not available // Item which is loaded by CameraItem if Qt Multimedia is not available
Rectangle { Rectangle {
id: root id: root
color: "grey" color: "grey"
@@ -56,7 +56,7 @@ Rectangle {
anchors.margins: 10 anchors.margins: 10
color: "white" color: "white"
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed" text: "Failed to create Camera item\n\nCheck that Qt Multimedia is installed"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }

4
examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
View File

@@ -41,7 +41,7 @@
import QtQuick 2.0 import QtQuick 2.0
// Item which is loaded by VideoItem if QtMultimediaKit is not available // Item which is loaded by VideoItem if Qt Multimedia is not available
Rectangle { Rectangle {
id: root id: root
color: "grey" color: "grey"
@@ -61,7 +61,7 @@ Rectangle {
anchors.margins: 10 anchors.margins: 10
color: "white" color: "white"
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed" text: "Failed to create Video item\n\nCheck that Qt Multimedia is installed"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }

2
src/multimedia/doc/src/qtmultimedia-cpp.qdoc
View File

@@ -30,7 +30,7 @@
\title Qt Multimedia C++ Classes \title Qt Multimedia C++ Classes
\ingroup modules \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. 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, If your application is serving complex use cases such as decoding media files, accessing video or audio buffers,