diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 06:53:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 06:53:20 (GMT) |
| commit | 12d63b05a942281e688d857d17c190564c77b698 (patch) | |
| tree | a42f444e588074d484875bfbbaf186ff7934bf3b /src/imports/multimedia/qdeclarativevideo.cpp | |
| parent | 4e8b2039ecbbda87b5c23cc0a574b7accfc2ad33 (diff) | |
| parent | cbda8ea64d8492d7c8f125cc1b43396b91ecdd8e (diff) | |
| download | Qt-12d63b05a942281e688d857d17c190564c77b698.zip Qt-12d63b05a942281e688d857d17c190564c77b698.tar.gz Qt-12d63b05a942281e688d857d17c190564c77b698.tar.bz2 | |
Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
Don't wait forever when scanning for wifi networks on win32 fails.
Revert 12b6987031be9faee3886d7623888feb4e1762af
Changed TEST_COMPILER from CC to CXX in configure script.
doc: Fixed several qdoc errors.
Carbon: Native filedialog does not apply filters on app-bundles
Cocoa: Native filedialog does not apply filters on app-bundles
Improve performance of QTimer::singleShot
Add a benchmark comparing single shot timer with invokeMethod
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
...
Diffstat (limited to 'src/imports/multimedia/qdeclarativevideo.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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. */ /*! |