diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2012-01-11 12:12:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 04:11:48 +0100 |
| commit | 3d88a055d03dc680ef0960aba872d2c9f67301fb (patch) | |
| tree | e7b68daefb95baf083fedd5d9ba172678ffee2ba /doc/src/plugins/qml-multimedia.qdoc | |
| parent | 99b80809c737cb6eb0577788a94d06f8429f4d1b (diff) | |
Updated QtMultimedia declarative module to version 5.0
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>
Diffstat (limited to 'doc/src/plugins/qml-multimedia.qdoc')
| -rw-r--r-- | doc/src/plugins/qml-multimedia.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/plugins/qml-multimedia.qdoc b/doc/src/plugins/qml-multimedia.qdoc index b539cf499..84020efa1 100644 --- a/doc/src/plugins/qml-multimedia.qdoc +++ b/doc/src/plugins/qml-multimedia.qdoc @@ -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 |