diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 03:48:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 03:48:52 (GMT) |
| commit | fcb912dfa85ab1045c08a0c5bee6bc4e84c90ef2 (patch) | |
| tree | 041855a99f1c06b4e2f0096f4ae8d4074ae0ee2a /src/imports/multimedia/qdeclarativeaudio.cpp | |
| parent | 9a32c5940f259f101f13b91dcb95d9861fb9043d (diff) | |
| parent | e7edb6de8c1d24163bdb9eb83fbec6a7c7208790 (diff) | |
| download | Qt-fcb912dfa85ab1045c08a0c5bee6bc4e84c90ef2.zip Qt-fcb912dfa85ab1045c08a0c5bee6bc4e84c90ef2.tar.gz Qt-fcb912dfa85ab1045c08a0c5bee6bc4e84c90ef2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits)
use Qt's private mac functions, reduce code redundancy
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
don't try to build corewlan plugin when corewlan was not found at configure
Avoid conversion to/from QChar in the cn codec to unicode
Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
...
Diffstat (limited to 'src/imports/multimedia/qdeclarativeaudio.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 5 |
1 files changed, 3 insertions, 2 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 |