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

Updated QtMultimedia declarative module to version 5.0

Browse Source 
The QtMultimedia module should have version 5.0 to align with
Qt 5 in general. This change updates the version, but keeps
4.0 versions of the elements for compatability purposes.

Documentation and examples has also been updated to reflect
this version change.

Change-Id: Ica10c1a5ecc2c7233192a65e04ff77eb33a77e30
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Jonas Rabbe
2012-01-11 12:12:55 +10:00
committed by Qt by Nokia
parent 99b80809c7
commit 3d88a055d0
30 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/examples/qmlvideofx.qdoc
View File

@@ -77,7 +77,7 @@ a wiggly effect to the content:
\code
import QtQuick 2.0
import QtMultimedia 4.0
import QtMultimedia 5.0
Rectangle {
width: 300

12
doc/src/plugins/qml-multimedia.qdoc
View File

@@ -54,8 +54,8 @@
\qml
import Qt 4.7
import QtMultimedia 4.0
import QtQuick 2.0
import QtMultimedia 5.0
// ...
Audio {
@@ -237,8 +237,8 @@
\qml
import Qt 4.7
import QtMultimedia 4.0
import QtQuick 2.0
import QtMultimedia 5.0
SoundEffect {
@@ -264,8 +264,8 @@
including white balance, exposure compensation and flash mode, and control zoom.
\qml
import Qt 4.7
import QtMultimedia 4.0
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
focus : visible // to receive focus and capture key events when visible

4
doc/src/snippets/multimedia-snippets/soundeffect.qml
View File

@@ -40,8 +40,8 @@
****************************************************************************/
//! [complete snippet]
import Qt 4.7
import QtMultimedia 4.0
import QtQuick 2.0
import QtMultimedia 5.0
Text {
text: "Click Me!";