diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:33:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:33:34 (GMT) |
| commit | 0d6d25e6796a85ea44d982a8ec618d920371c7a9 (patch) | |
| tree | 71b497a5370b0707b4da324b6918bce7f4901879 /src/imports | |
| parent | 878c2a984b78cdfc88e4474f6719f07662c7ac68 (diff) | |
| parent | 12d63b05a942281e688d857d17c190564c77b698 (diff) | |
| download | Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.zip Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.tar.gz Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.tar.bz2 | |
Merge remote branch 'qt/4.7' into qml-4.7
Conflicts:
src/declarative/util/qdeclarativestateoperations.cpp
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 5 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideo.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index df2888c..40133ee 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -316,8 +316,9 @@ QDeclarativeAudio::Error QDeclarativeAudio::error() const /*! \qmlsignal Audio::onError(error, errorString) - This handler is called when an \l {Error}{error} has occurred. The errorString parameter - may contain more detailed information about the error. + This handler is called when an \l {QMediaPlayer::Error}{error} has + occurred. The errorString parameter may contain more detailed + information about the error. */ QT_END_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp index 064f242..80c0ba4 100644 --- a/src/imports/multimedia/qdeclarativevideo.cpp +++ b/src/imports/multimedia/qdeclarativevideo.cpp @@ -317,8 +317,9 @@ QDeclarativeVideo::Error QDeclarativeVideo::error() const /*! \qmlsignal Video::onError(error, errorString) - This handler is called when an \l {Error}{error} has occurred. The errorString parameter - may contain more detailed information about the error. + This handler is called when an \l {QMediaPlayer::Error}{error} has + occurred. The errorString parameter may contain more detailed + information about the error. */ /*! |