summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-01 06:47:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-01 06:47:19 (GMT)
commit621a470e1c996c471a5a4492a0b71a75b1add6d4 (patch)
tree5c0894d25eaea93bb7e931bafdd09708294e12ce /src/imports
parent006d3ee14b37f243ef4765d4252cfb1a61648f14 (diff)
downloadQt-621a470e1c996c471a5a4492a0b71a75b1add6d4.zip
Qt-621a470e1c996c471a5a4492a0b71a75b1add6d4.tar.gz
Qt-621a470e1c996c471a5a4492a0b71a75b1add6d4.tar.bz2
Add media elements to the QML Elements docs.
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp5
-rw-r--r--src/imports/multimedia/qdeclarativevideo.cpp5
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 077ed9a..8d2dc61 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -51,7 +51,12 @@ QT_BEGIN_NAMESPACE
\since 4.7
\brief The Audio element allows you to add audio playback to a scene.
+ This element is part of the \bold{Qt.multimedia 4.7} module.
+
\qml
+ import Qt 4.6
+ import Qt.multimedia 4.7
+
Audio { source: "audio/song.mp3" }
\endqml
diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp
index c878fe1..bf112be 100644
--- a/src/imports/multimedia/qdeclarativevideo.cpp
+++ b/src/imports/multimedia/qdeclarativevideo.cpp
@@ -73,7 +73,12 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
\brief The Video element allows you to add videos to a scene.
\inherits Item
+ This element is part of the \bold{Qt.multimedia 4.7} module.
+
\qml
+ import Qt 4.6
+ import Qt.multimedia 4.7
+
Video { source: "video/movie.mpg" }
\endqml
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index e69c235..e98a801 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -623,7 +623,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
\brief The Particles object generates and moves particles.
\inherits Item
- Particles are available in the Qt.labs.particles 1.0 module.
+ Particles are available in the \bold{Qt.labs.particles 1.0} module.
This element provides preliminary support for particles in QML,
and may be heavily changed or removed in later versions.