summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-30 15:21:33 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-30 15:21:33 (GMT)
commitaa59008b92d4d1eb5b45352cac3408cc39086dba (patch)
tree13d3014d707b86e293726fd38d0e75d1354f378e /doc
parente0463464773f5eb2bda98a467a9c91092a1f1964 (diff)
parentcd796aa6dcdf83fa50ced56a9885835fda851a09 (diff)
downloadQt-aa59008b92d4d1eb5b45352cac3408cc39086dba.zip
Qt-aa59008b92d4d1eb5b45352cac3408cc39086dba.tar.gz
Qt-aa59008b92d4d1eb5b45352cac3408cc39086dba.tar.bz2
Merge commit 'origin/4.5'
Diffstat (limited to 'doc')
-rw-r--r--doc/src/phonon-api.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index 0743bab..09274bf 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -1115,6 +1115,11 @@
\note Sequential devices can also be used, but MediaObject::isSeekable() will
return false as a result.
+ \warning On Windows, we only support \l{QIODevice}s containing the
+ \c avi, \c mp3, or \c mpg formats. Use the constructor that takes
+ a file name to open files (the Qt backend does not use a QFile
+ internally).
+
\sa setAutoDelete()
*/
@@ -1864,7 +1869,7 @@
\snippet doc/src/snippets/code/doc_src_phonon-api.qdoc 14
- \sa currentSource()
+ \sa currentSource(), MediaSource
*/
/*!