diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 11:29:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 11:29:25 (GMT) |
| commit | 38b8940413fc83d2e641be580369125709ffa8e1 (patch) | |
| tree | 6612da384fae93e4b31fb8ea7007d3e3934b01d9 /src/imports/multimedia/qdeclarativeaudio.cpp | |
| parent | c74dac2a0ef5d1b428c4da4e48fab05f9886233a (diff) | |
| parent | edc74eecf2967b295c7b881977527474be8e1c80 (diff) | |
| download | Qt-38b8940413fc83d2e641be580369125709ffa8e1.zip Qt-38b8940413fc83d2e641be580369125709ffa8e1.tar.gz Qt-38b8940413fc83d2e641be580369125709ffa8e1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits)
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
Update strings in test
remove debugs
Make the dynamic creation functions on the Qt object
More focus example cleanup.
Autotests
Add hasModelChildren property to delegates with QAbstractItemModel model type.
Emit released and hoveredChanged in MouseArea when a UngrabMouse is received
Balance grid items for larger displays.
Autotest
Cleanup declarative focus example.
Add forceFocus method to QDeclarativeItem.
Don't allow properties in Component elements
Fix crash when QDeclarativeInfo objects are copied
Ignore message in QDeclarativeLoader test.
Fix crash.
Fix qmlvisual/animation/parentAnimation autotest
delete the viewer before calling exit(). Ensures correct cleanup.
...
Diffstat (limited to 'src/imports/multimedia/qdeclarativeaudio.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 82d5d89..849c51d 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -195,7 +195,7 @@ void QDeclarativeAudio::stop() */ /*! - \qmlproperty enum Audio::status + \qmlproperty enumeration Audio::status This property holds the status of media loading. It can be one of: @@ -263,7 +263,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const */ /*! - \qmlproperty qreal Audio::volume + \qmlproperty real Audio::volume This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume). */ @@ -275,7 +275,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const */ /*! - \qmlproperty qreal Audio::bufferProgress + \qmlproperty real Audio::bufferProgress This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full). @@ -290,13 +290,13 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const */ /*! - \qmlproperty qreal Audio::playbackRate + \qmlproperty real Audio::playbackRate This property holds the rate at which audio is played at as a multiple of the normal rate. */ /*! - \qmlproperty enum Audio::error + \qmlproperty enumeration Audio::error This property holds the error state of the audio. It can be one of: |