diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-10-01 15:45:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 12:56:28 +0200 |
| commit | 43be5d9763eea0b7a71c627f05ffb5de0b97249f (patch) | |
| tree | bef5b226d73887b5909ea4dbd622020c5fdde436 | |
| parent | 40908fdb77adcc59e8a60e3afd25ed13b451a5b3 (diff) | |
Doc: Removing version number from the QDoc comments.
The version is not needed anymore and QDoc handles them as a different
module, causing errors.
Task-number: QTBUG-32172
Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 284 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 38 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameracapture.cpp | 24 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure.cpp | 26 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraimageprocessing.cpp | 16 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerarecorder.cpp | 46 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 46 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata.cpp | 14 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 4 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput.cpp | 28 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 40 | ||||
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 8 |
14 files changed, 295 insertions, 295 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 348c535a5..1da92c308 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -131,7 +131,7 @@ QDeclarativeAudio::~QDeclarativeAudio() } /*! - \qmlproperty enumeration QtMultimedia5::Audio::availability + \qmlproperty enumeration QtMultimedia::Audio::availability Returns the availability state of the media player. @@ -358,7 +358,7 @@ QDeclarativeMediaMetaData *QDeclarativeAudio::metaData() const /*! - \qmlmethod QtMultimedia5::Audio::play() + \qmlmethod QtMultimedia::Audio::play() Starts playback of the media. @@ -374,7 +374,7 @@ void QDeclarativeAudio::play() } /*! - \qmlmethod QtMultimedia5::Audio::pause() + \qmlmethod QtMultimedia::Audio::pause() Pauses playback of the media. @@ -390,7 +390,7 @@ void QDeclarativeAudio::pause() } /*! - \qmlmethod QtMultimedia5::Audio::stop() + \qmlmethod QtMultimedia::Audio::stop() Stops playback of the media. @@ -406,7 +406,7 @@ void QDeclarativeAudio::stop() } /*! - \qmlmethod QtMultimedia5::Audio::seek(offset) + \qmlmethod QtMultimedia::Audio::seek(offset) If the \l seekable property is true, seeks the current playback position to \a offset. @@ -434,13 +434,13 @@ void QDeclarativeAudio::seek(int position) } /*! - \qmlproperty url QtMultimedia5::Audio::source + \qmlproperty url QtMultimedia::Audio::source This property holds the source URL of the media. */ /*! - \qmlproperty bool QtMultimedia5::Audio::autoLoad + \qmlproperty bool QtMultimedia::Audio::autoLoad This property indicates if loading of media should begin immediately. @@ -448,32 +448,32 @@ void QDeclarativeAudio::seek(int position) */ /*! - \qmlsignal QtMultimedia5::Audio::playbackStateChanged() + \qmlsignal QtMultimedia::Audio::playbackStateChanged() This handler is called when the \l playbackState property is altered. */ /*! - \qmlsignal QtMultimedia5::Audio::paused() + \qmlsignal QtMultimedia::Audio::paused() This handler is called when playback is paused. */ /*! - \qmlsignal QtMultimedia5::Audio::stopped() + \qmlsignal QtMultimedia::Audio::stopped() This handler is called when playback is stopped. */ /*! - \qmlsignal QtMultimedia5::Audio::playing() + \qmlsignal QtMultimedia::Audio::playing() This handler is called when playback is started or resumed. */ /*! - \qmlproperty enumeration QtMultimedia5::Audio::status + \qmlproperty enumeration QtMultimedia::Audio::status This property holds the status of media loading. It can be one of: @@ -497,7 +497,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const /*! - \qmlproperty enumeration QtMultimedia5::Audio::playbackState + \qmlproperty enumeration QtMultimedia::Audio::playbackState This property holds the state of media playback. It can be one of: @@ -514,7 +514,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const } /*! - \qmlproperty bool QtMultimedia5::Audio::autoPlay + \qmlproperty bool QtMultimedia::Audio::autoPlay This property controls whether the media will begin to play on start up. @@ -522,7 +522,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const */ /*! - \qmlproperty int QtMultimedia5::Audio::duration + \qmlproperty int QtMultimedia::Audio::duration This property holds the duration of the media in milliseconds. @@ -530,7 +530,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const */ /*! - \qmlproperty int QtMultimedia5::Audio::position + \qmlproperty int QtMultimedia::Audio::position This property holds the current playback position in milliseconds. @@ -540,7 +540,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const */ /*! - \qmlproperty real QtMultimedia5::Audio::volume + \qmlproperty real QtMultimedia::Audio::volume This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume). @@ -548,7 +548,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const */ /*! - \qmlproperty bool QtMultimedia5::Audio::muted + \qmlproperty bool QtMultimedia::Audio::muted This property holds whether the audio output is muted. @@ -556,7 +556,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const */ /*! - \qmlproperty bool QtMultimedia5::Audio::hasAudio + \qmlproperty bool QtMultimedia::Audio::hasAudio This property holds whether the media contains audio. */ @@ -567,7 +567,7 @@ bool QDeclarativeAudio::hasAudio() const } /*! - \qmlproperty bool QtMultimedia5::Audio::hasVideo + \qmlproperty bool QtMultimedia::Audio::hasVideo This property holds whether the media contains video. */ @@ -578,14 +578,14 @@ bool QDeclarativeAudio::hasVideo() const } /*! - \qmlproperty real QtMultimedia5::Audio::bufferProgress + \qmlproperty real QtMultimedia::Audio::bufferProgress This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full). */ /*! - \qmlproperty bool QtMultimedia5::Audio::seekable + \qmlproperty bool QtMultimedia::Audio::seekable This property holds whether position of the audio can be changed. @@ -593,7 +593,7 @@ bool QDeclarativeAudio::hasVideo() const */ /*! - \qmlproperty real QtMultimedia5::Audio::playbackRate + \qmlproperty real QtMultimedia::Audio::playbackRate This property holds the rate at which audio is played at as a multiple of the normal rate. @@ -601,7 +601,7 @@ bool QDeclarativeAudio::hasVideo() const */ /*! - \qmlproperty enumeration QtMultimedia5::Audio::error + \qmlproperty enumeration QtMultimedia::Audio::error This property holds the error state of the audio. It can be one of: @@ -739,13 +739,13 @@ void QDeclarativeAudio::_q_statusChanged() } /*! - \qmlproperty string QtMultimedia5::Audio::errorString + \qmlproperty string QtMultimedia::Audio::errorString This property holds a string describing the current error condition in more detail. */ /*! - \qmlsignal QtMultimedia5::Audio::error(error, errorString) + \qmlsignal QtMultimedia::Audio::error(error, errorString) This handler is called when an \l {QMediaPlayer::Error}{error} has occurred. The errorString parameter may contain more detailed @@ -753,7 +753,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.title + \qmlproperty variant QtMultimedia::Audio::metaData.title This property holds the title of the media. @@ -761,7 +761,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.subTitle + \qmlproperty variant QtMultimedia::Audio::metaData.subTitle This property holds the sub-title of the media. @@ -769,7 +769,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.author + \qmlproperty variant QtMultimedia::Audio::metaData.author This property holds the author of the media. @@ -777,7 +777,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.comment + \qmlproperty variant QtMultimedia::Audio::metaData.comment This property holds a user comment about the media. @@ -785,7 +785,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.description + \qmlproperty variant QtMultimedia::Audio::metaData.description This property holds a description of the media. @@ -793,7 +793,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.category + \qmlproperty variant QtMultimedia::Audio::metaData.category This property holds the category of the media @@ -801,7 +801,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.genre + \qmlproperty variant QtMultimedia::Audio::metaData.genre This property holds the genre of the media. @@ -809,7 +809,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.year + \qmlproperty variant QtMultimedia::Audio::metaData.year This property holds the year of release of the media. @@ -817,7 +817,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.date + \qmlproperty variant QtMultimedia::Audio::metaData.date This property holds the date of the media. @@ -825,7 +825,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.userRating + \qmlproperty variant QtMultimedia::Audio::metaData.userRating This property holds a user rating of the media in the range of 0 to 100. @@ -833,7 +833,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.keywords + \qmlproperty variant QtMultimedia::Audio::metaData.keywords This property holds a list of keywords describing the media. @@ -841,7 +841,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.language + \qmlproperty variant QtMultimedia::Audio::metaData.language This property holds the language of the media, as an ISO 639-2 code. @@ -849,7 +849,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.publisher + \qmlproperty variant QtMultimedia::Audio::metaData.publisher This property holds the publisher of the media. @@ -857,7 +857,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.copyright + \qmlproperty variant QtMultimedia::Audio::metaData.copyright This property holds the media's copyright notice. @@ -865,7 +865,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.parentalRating + \qmlproperty variant QtMultimedia::Audio::metaData.parentalRating This property holds the parental rating of the media. @@ -873,7 +873,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.ratingOrganization + \qmlproperty variant QtMultimedia::Audio::metaData.ratingOrganization This property holds the name of the rating organization responsible for the parental rating of the media. @@ -882,7 +882,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.size + \qmlproperty variant QtMultimedia::Audio::metaData.size This property property holds the size of the media in bytes. @@ -890,7 +890,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.mediaType + \qmlproperty variant QtMultimedia::Audio::metaData.mediaType This property holds the type of the media. @@ -898,7 +898,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.audioBitRate + \qmlproperty variant QtMultimedia::Audio::metaData.audioBitRate This property holds the bit rate of the media's audio stream in bits per second. @@ -907,7 +907,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.audioCodec + \qmlproperty variant QtMultimedia::Audio::metaData.audioCodec This property holds the encoding of the media audio stream. @@ -915,7 +915,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.averageLevel + \qmlproperty variant QtMultimedia::Audio::metaData.averageLevel This property holds the average volume level of the media. @@ -923,7 +923,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.channelCount + \qmlproperty variant QtMultimedia::Audio::metaData.channelCount This property holds the number of channels in the media's audio stream. @@ -931,7 +931,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.peakValue + \qmlproperty variant QtMultimedia::Audio::metaData.peakValue This property holds the peak volume of media's audio stream. @@ -939,7 +939,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.sampleRate + \qmlproperty variant QtMultimedia::Audio::metaData.sampleRate This property holds the sample rate of the media's audio stream in hertz. @@ -947,7 +947,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.albumTitle + \qmlproperty variant QtMultimedia::Audio::metaData.albumTitle This property holds the title of the album the media belongs to. @@ -955,7 +955,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.albumArtist + \qmlproperty variant QtMultimedia::Audio::metaData.albumArtist This property holds the name of the principal artist of the album the media belongs to. @@ -964,7 +964,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.contributingArtist + \qmlproperty variant QtMultimedia::Audio::metaData.contributingArtist This property holds the names of artists contributing to the media. @@ -972,7 +972,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.composer + \qmlproperty variant QtMultimedia::Audio::metaData.composer This property holds the composer of the media. @@ -980,7 +980,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.conductor + \qmlproperty variant QtMultimedia::Audio::metaData.conductor This property holds the conductor of the media. @@ -988,7 +988,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.lyrics + \qmlproperty variant QtMultimedia::Audio::metaData.lyrics This property holds the lyrics to the media. @@ -996,7 +996,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.mood + \qmlproperty variant QtMultimedia::Audio::metaData.mood This property holds the mood of the media. @@ -1004,7 +1004,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.trackNumber + \qmlproperty variant QtMultimedia::Audio::metaData.trackNumber This property holds the track number of the media. @@ -1012,7 +1012,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.trackCount + \qmlproperty variant QtMultimedia::Audio::metaData.trackCount This property holds the number of tracks on the album containing the media. @@ -1020,7 +1020,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlSmall + \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlSmall This property holds the URL of a small cover art image. @@ -1028,7 +1028,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlLarge + \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlLarge This property holds the URL of a large cover art image. @@ -1036,7 +1036,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.resolution + \qmlproperty variant QtMultimedia::Audio::metaData.resolution This property holds the dimension of an image or video. @@ -1044,7 +1044,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.pixelAspectRatio + \qmlproperty variant QtMultimedia::Audio::metaData.pixelAspectRatio This property holds the pixel aspect ratio of an image or video. @@ -1052,7 +1052,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.videoFrameRate + \qmlproperty variant QtMultimedia::Audio::metaData.videoFrameRate This property holds the frame rate of the media's video stream. @@ -1060,7 +1060,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.videoBitRate + \qmlproperty variant QtMultimedia::Audio::metaData.videoBitRate This property holds the bit rate of the media's video stream in bits per second. @@ -1069,7 +1069,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.videoCodec + \qmlproperty variant QtMultimedia::Audio::metaData.videoCodec This property holds the encoding of the media's video stream. @@ -1077,7 +1077,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.posterUrl + \qmlproperty variant QtMultimedia::Audio::metaData.posterUrl This property holds the URL of a poster image. @@ -1085,7 +1085,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.chapterNumber + \qmlproperty variant QtMultimedia::Audio::metaData.chapterNumber This property holds the chapter number of the media. @@ -1093,7 +1093,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.director + \qmlproperty variant QtMultimedia::Audio::metaData.director This property holds the director of the media. @@ -1101,7 +1101,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.leadPerformer + \qmlproperty variant QtMultimedia::Audio::metaData.leadPerformer This property holds the lead performer in the media. @@ -1109,7 +1109,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::Audio::metaData.writer + \qmlproperty variant QtMultimedia::Audio::metaData.writer This property holds the writer of the media. @@ -1181,7 +1181,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty enumeration QtMultimedia5::MediaPlayer::availability + \qmlproperty enumeration QtMultimedia::MediaPlayer::availability Returns the availability state of the media player. @@ -1202,7 +1202,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlmethod QtMultimedia5::MediaPlayer::play() + \qmlmethod QtMultimedia::MediaPlayer::play() Starts playback of the media. @@ -1210,7 +1210,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlmethod QtMultimedia5::MediaPlayer::pause() + \qmlmethod QtMultimedia::MediaPlayer::pause() Pauses playback of the media. @@ -1218,7 +1218,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlmethod QtMultimedia5::MediaPlayer::stop() + \qmlmethod QtMultimedia::MediaPlayer::stop() Stops playback of the media. @@ -1226,13 +1226,13 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty url QtMultimedia5::MediaPlayer::source + \qmlproperty url QtMultimedia::MediaPlayer::source This property holds the source URL of the media. */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::autoLoad + \qmlproperty bool QtMultimedia::MediaPlayer::autoLoad This property indicates if loading of media should begin immediately. @@ -1240,32 +1240,32 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlsignal QtMultimedia5::MediaPlayer::playbackStateChanged() + \qmlsignal QtMultimedia::MediaPlayer::playbackStateChanged() This handler is called when the \l playbackState property is altered. */ /*! - \qmlsignal QtMultimedia5::MediaPlayer::paused() + \qmlsignal QtMultimedia::MediaPlayer::paused() This handler is called when playback is paused. */ /*! - \qmlsignal QtMultimedia5::MediaPlayer::stopped() + \qmlsignal QtMultimedia::MediaPlayer::stopped() This handler is called when playback is stopped. */ /*! - \qmlsignal QtMultimedia5::MediaPlayer::playing() + \qmlsignal QtMultimedia::MediaPlayer::playing() This handler is called when playback is started or resumed. */ /*! - \qmlproperty enumeration QtMultimedia5::MediaPlayer::status + \qmlproperty enumeration QtMultimedia::MediaPlayer::status This property holds the status of media loading. It can be one of: @@ -1283,7 +1283,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty enumeration QtMultimedia5::MediaPlayer::playbackState + \qmlproperty enumeration QtMultimedia::MediaPlayer::playbackState This property holds the state of media playback. It can be one of: @@ -1295,7 +1295,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::autoPlay + \qmlproperty bool QtMultimedia::MediaPlayer::autoPlay This property controls whether the media will begin to play on start up. @@ -1303,7 +1303,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty int QtMultimedia5::MediaPlayer::duration + \qmlproperty int QtMultimedia::MediaPlayer::duration This property holds the duration of the media in milliseconds. @@ -1311,7 +1311,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty int QtMultimedia5::MediaPlayer::position + \qmlproperty int QtMultimedia::MediaPlayer::position This property holds the current playback position in milliseconds. @@ -1321,7 +1321,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty real QtMultimedia5::MediaPlayer::volume + \qmlproperty real QtMultimedia::MediaPlayer::volume This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume). @@ -1329,7 +1329,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::muted + \qmlproperty bool QtMultimedia::MediaPlayer::muted This property holds whether the audio output is muted. @@ -1337,26 +1337,26 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::hasAudio + \qmlproperty bool QtMultimedia::MediaPlayer::hasAudio This property holds whether the media contains audio. */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::hasVideo + \qmlproperty bool QtMultimedia::MediaPlayer::hasVideo This property holds whether the media contains video. */ /*! - \qmlproperty real QtMultimedia5::MediaPlayer::bufferProgress + \qmlproperty real QtMultimedia::MediaPlayer::bufferProgress This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full). */ /*! - \qmlproperty bool QtMultimedia5::MediaPlayer::seekable + \qmlproperty bool QtMultimedia::MediaPlayer::seekable This property holds whether position of the audio can be changed. @@ -1364,7 +1364,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlmethod QtMultimedia5::MediaPlayer::seek(offset) + \qmlmethod QtMultimedia::MediaPlayer::seek(offset) If the \l seekable property is true, seeks the current playback position to \a offset. @@ -1376,7 +1376,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty real QtMultimedia5::MediaPlayer::playbackRate + \qmlproperty real QtMultimedia::MediaPlayer::playbackRate This property holds the rate at which audio is played at as a multiple of the normal rate. @@ -1384,7 +1384,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty enumeration QtMultimedia5::MediaPlayer::error + \qmlproperty enumeration QtMultimedia::MediaPlayer::error This property holds the error state of the audio. It can be one of: @@ -1407,13 +1407,13 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty string QtMultimedia5::MediaPlayer::errorString + \qmlproperty string QtMultimedia::MediaPlayer::errorString This property holds a string describing the current error condition in more detail. */ /*! - \qmlsignal QtMultimedia5::MediaPlayer::error(error, errorString) + \qmlsignal QtMultimedia::MediaPlayer::error(error, errorString) This handler is called when an \l {QMediaPlayer::Error}{error} has occurred. The errorString parameter may contain more detailed @@ -1421,7 +1421,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.title + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.title This property holds the title of the media. @@ -1429,7 +1429,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.subTitle + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.subTitle This property holds the sub-title of the media. @@ -1437,7 +1437,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.author + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.author This property holds the author of the media. @@ -1445,7 +1445,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.comment + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.comment This property holds a user comment about the media. @@ -1453,7 +1453,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.description + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.description This property holds a description of the media. @@ -1461,7 +1461,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.category + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.category This property holds the category of the media @@ -1469,7 +1469,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.genre + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.genre This property holds the genre of the media. @@ -1477,7 +1477,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.year + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.year This property holds the year of release of the media. @@ -1485,7 +1485,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.date + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.date This property holds the date of the media. @@ -1493,7 +1493,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.userRating + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.userRating This property holds a user rating of the media in the range of 0 to 100. @@ -1501,7 +1501,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.keywords + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.keywords This property holds a list of keywords describing the media. @@ -1509,7 +1509,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.language + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.language This property holds the language of the media, as an ISO 639-2 code. @@ -1517,7 +1517,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.publisher + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.publisher This property holds the publisher of the media. @@ -1525,7 +1525,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.copyright + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.copyright This property holds the media's copyright notice. @@ -1533,7 +1533,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.parentalRating + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.parentalRating This property holds the parental rating of the media. @@ -1541,7 +1541,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.ratingOrganization + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.ratingOrganization This property holds the name of the rating organization responsible for the parental rating of the media. @@ -1550,7 +1550,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.size + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.size This property property holds the size of the media in bytes. @@ -1558,7 +1558,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.mediaType + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.mediaType This property holds the type of the media. @@ -1566,7 +1566,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.audioBitRate + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.audioBitRate This property holds the bit rate of the media's audio stream in bits per second. @@ -1575,7 +1575,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.audioCodec + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.audioCodec This property holds the encoding of the media audio stream. @@ -1583,7 +1583,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.averageLevel + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.averageLevel This property holds the average volume level of the media. @@ -1591,7 +1591,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.channelCount + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.channelCount This property holds the number of channels in the media's audio stream. @@ -1599,7 +1599,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.peakValue + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.peakValue This property holds the peak volume of media's audio stream. @@ -1607,7 +1607,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.sampleRate + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.sampleRate This property holds the sample rate of the media's audio stream in hertz. @@ -1615,7 +1615,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.albumTitle + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.albumTitle This property holds the title of the album the media belongs to. @@ -1623,7 +1623,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.albumArtist + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.albumArtist This property holds the name of the principal artist of the album the media belongs to. @@ -1632,7 +1632,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.contributingArtist + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.contributingArtist This property holds the names of artists contributing to the media. @@ -1640,7 +1640,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.composer + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.composer This property holds the composer of the media. @@ -1648,7 +1648,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.conductor + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.conductor This property holds the conductor of the media. @@ -1656,7 +1656,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.lyrics + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.lyrics This property holds the lyrics to the media. @@ -1664,7 +1664,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.mood + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.mood This property holds the mood of the media. @@ -1672,7 +1672,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.trackNumber + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.trackNumber This property holds the track number of the media. @@ -1680,7 +1680,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.trackCount + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.trackCount This property holds the number of tracks on the album containing the media. @@ -1688,7 +1688,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.coverArtUrlSmall + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlSmall This property holds the URL of a small cover art image. @@ -1696,7 +1696,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.coverArtUrlLarge + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlLarge This property holds the URL of a large cover art image. @@ -1704,7 +1704,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.resolution + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.resolution This property holds the dimension of an image or video. @@ -1712,7 +1712,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.pixelAspectRatio + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.pixelAspectRatio This property holds the pixel aspect ratio of an image or video. @@ -1720,7 +1720,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.videoFrameRate + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoFrameRate This property holds the frame rate of the media's video stream. @@ -1728,7 +1728,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.videoBitRate + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoBitRate This property holds the bit rate of the media's video stream in bits per second. @@ -1737,7 +1737,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.videoCodec + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoCodec This property holds the encoding of the media's video stream. @@ -1745,7 +1745,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.posterUrl + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.posterUrl This property holds the URL of a poster image. @@ -1753,7 +1753,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.chapterNumber + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.chapterNumber This property holds the chapter number of the media. @@ -1761,7 +1761,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.director + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.director This property holds the director of the media. @@ -1769,7 +1769,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.leadPerformer + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.leadPerformer This property holds the lead performer in the media. @@ -1777,7 +1777,7 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia5::MediaPlayer::metaData.writer + \qmlproperty variant QtMultimedia::MediaPlayer::metaData.writer This property holds the writer of the media. diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 3c868a25d..35feecfe2 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -223,11 +223,11 @@ QDeclarativeCamera::Error QDeclarativeCamera::errorCode() const } /*! - \qmlproperty string QtMultimedia5::Camera::errorString + \qmlproperty string QtMultimedia::Camera::errorString This property holds the last error string, if any. - \sa QtMultimedia5::Camera::onError + \sa QtMultimedia::Camera::onError */ QString QDeclarativeCamera::errorString() const { @@ -235,7 +235,7 @@ QString QDeclarativeCamera::errorString() const } /*! - \qmlproperty enumeration QtMultimedia5::Camera::availability + \qmlproperty enumeration QtMultimedia::Camera::availability This property holds the availability state of the camera. @@ -262,7 +262,7 @@ QDeclarativeCamera::Availability QDeclarativeCamera::availability() const /*! - \qmlproperty enumeration QtMultimedia5::Camera::captureMode + \qmlproperty enumeration QtMultimedia::Camera::captureMode This property holds the camera capture mode, which can be one of the following: @@ -293,7 +293,7 @@ void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode) /*! - \qmlproperty enumeration QtMultimedia5::Camera::cameraState + \qmlproperty enumeration QtMultimedia::Camera::cameraState This property holds the camera object's current state, which can be one of the following: @@ -330,7 +330,7 @@ QDeclarativeCamera::State QDeclarativeCamera::cameraState() const } /*! - \qmlproperty enumeration QtMultimedia5::Camera::cameraStatus + \qmlproperty enumeration QtMultimedia::Camera::cameraStatus This property holds the camera object's current status, which can be one of the following: @@ -407,7 +407,7 @@ void QDeclarativeCamera::setCameraState(QDeclarativeCamera::State state) } /*! - \qmlmethod QtMultimedia5::Camera::start() + \qmlmethod QtMultimedia::Camera::start() Starts the camera. Viewfinder frames will be available and image or movie capture will @@ -419,7 +419,7 @@ void QDeclarativeCamera::start() } /*! - \qmlmethod QtMultimedia5::Camera::stop() + \qmlmethod QtMultimedia::Camera::stop() Stops the camera, but leaves the camera stack loaded. @@ -431,7 +431,7 @@ void QDeclarativeCamera::stop() /*! - \qmlproperty enumeration QtMultimedia5::Camera::lockStatus + \qmlproperty enumeration QtMultimedia::Camera::lockStatus This property holds the status of all the requested camera locks. @@ -492,7 +492,7 @@ QDeclarativeCamera::LockStatus QDeclarativeCamera::lockStatus() const } /*! - \qmlmethod QtMultimedia5::Camera::searchAndLock() + \qmlmethod QtMultimedia::Camera::searchAndLock() Start focusing, exposure and white balance calculation. @@ -507,7 +507,7 @@ void QDeclarativeCamera::searchAndLock() } /*! - \qmlmethod QtMultimedia5::Camera::unlock() + \qmlmethod QtMultimedia::Camera::unlock() Unlock focus, exposure and white balance locks. */ @@ -521,7 +521,7 @@ void QDeclarativeCamera::unlock() This property holds the maximum optical zoom factor supported, or 1.0 if optical zoom is not supported. */ /*! - \qmlproperty real QtMultimedia5::Camera::maximumOpticalZoom + \qmlproperty real QtMultimedia::Camera::maximumOpticalZoom This property holds the maximum optical zoom factor supported, or 1.0 if optical zoom is not supported. */ @@ -535,7 +535,7 @@ qreal QDeclarativeCamera::maximumOpticalZoom() const This property holds the maximum digital zoom factor supported, or 1.0 if digital zoom is not supported. */ /*! - \qmlproperty real QtMultimedia5::Camera::maximumDigitalZoom + \qmlproperty real QtMultimedia::Camera::maximumDigitalZoom This property holds the maximum digital zoom factor supported, or 1.0 if digital zoom is not supported. */ @@ -550,7 +550,7 @@ qreal QDeclarativeCamera::maximumDigitalZoom() const */ /*! - \qmlproperty real QtMultimedia5::Camera::opticalZoom + \qmlproperty real QtMultimedia::Camera::opticalZoom This property holds the current optical zoom factor. */ @@ -569,7 +569,7 @@ void QDeclarativeCamera::setOpticalZoom(qreal value) This property holds the current digital zoom factor. */ /*! - \qmlproperty real QtMultimedia5::Camera::digitalZoom + \qmlproperty real QtMultimedia::Camera::digitalZoom This property holds the current digital zoom factor. */ @@ -584,21 +584,21 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) } /*! - \qmlproperty variant QtMultimedia5::Camera::mediaObject + \qmlproperty variant QtMultimedia::Camera::mediaObject This property holds the media object for the camera. */ /*! - \qmlproperty enumeration QtMultimedia5::Camera::errorCode + \qmlproperty enumeration QtMultimedia::Camera::errorCode This property holds the last error code. - \sa QtMultimedia5::Camera::onError + \sa QtMultimedia::Camera::onError */ /*! - \qmlsignal QtMultimedia5::Camera::onError(errorCode, errorString) + \qmlsignal QtMultimedia::Camera::onError(errorCode, errorString) This handler is called when an error occurs. The enumeration value \a errorCode is one of the values defined below, and a descriptive string diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index a624ca701..b93ab456e 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -137,7 +137,7 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture() */ /*! - \qmlproperty bool QtMultimedia5::CameraCapture::ready + \qmlproperty bool QtMultimedia::CameraCapture::ready This property holds a bool value indicating whether the camera is ready to capture photos or not. @@ -154,7 +154,7 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const } /*! - \qmlmethod QtMultimedia5::CameraCapture::capture() + \qmlmethod QtMultimedia::CameraCapture::capture() Start image capture. The \l onImageCaptured() and \l onImageSaved() signals will be emitted when the capture is complete. @@ -177,7 +177,7 @@ int QDeclarativeCameraCapture::capture() } /*! - \qmlmethod QtMultimedia5::CameraCapture::captureToLocation(location) + \qmlmethod QtMultimedia::CameraCapture::captureToLocation(location) Start image capture to specified \a location. The \l onImageCaptured() and \l onImageSaved() signals will be emitted when the capture is complete. @@ -196,7 +196,7 @@ int QDeclarativeCameraCapture::captureToLocation(const QString &location) } /*! - \qmlmethod QtMultimedia5::CameraCapture::cancelCapture() + \qmlmethod QtMultimedia::CameraCapture::cancelCapture() Cancel pending image capture requests. */ @@ -211,7 +211,7 @@ void QDeclarativeCameraCapture::cancelCapture() This property holds the location of the last captured image. */ /*! - \qmlproperty string QtMultimedia5::CameraCapture::capturedImagePath + \qmlproperty string QtMultimedia::CameraCapture::capturedImagePath This property holds the location of the last captured image. */ @@ -254,7 +254,7 @@ void QDeclarativeCameraCapture::_q_captureFailed(int id, QCameraImageCapture::Er */ /*! - \qmlproperty size QtMultimedia5::CameraCapture::resolution + \qmlproperty size QtMultimedia::CameraCapture::resolution This property holds the resolution/size of the image to be captured. If empty, the system chooses the appropriate resolution. @@ -285,7 +285,7 @@ QCameraImageCapture::Error QDeclarativeCameraCapture::error() const */ /*! - \qmlproperty string QtMultimedia5::CameraCapture::errorString + \qmlproperty string QtMultimedia::CameraCapture::errorString This property holds the error message related to the last capture. */ @@ -295,7 +295,7 @@ QString QDeclarativeCameraCapture::errorString() const } /*! - \qmlmethod QtMultimedia5::CameraCapture::setMetadata(key, value) + \qmlmethod QtMultimedia::CameraCapture::setMetadata(key, value) Sets a particular metadata \a key to \a value for the subsequent image captures. @@ -309,14 +309,14 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant & } /*! - \qmlsignal QtMultimedia5::CameraCapture::onCaptureFailed(requestId, message) + \qmlsignal QtMultimedia::CameraCapture::onCaptureFailed(requestId, message) This handler is called when an error occurs during capture with \a requestId. A descriptive message is available in \a message. */ /*! - \qmlsignal QtMultimedia5::CameraCapture::onImageCaptured(requestId, preview) + \qmlsignal QtMultimedia::CameraCapture::onImageCaptured(requestId, preview) This handler is called when an image with \a requestId has been captured but not yet saved to the filesystem. The \a preview @@ -326,7 +326,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant & */ /*! - \qmlsignal QtMultimedia5::CameraCapture::onImageSaved(requestId, path) + \qmlsignal QtMultimedia::CameraCapture::onImageSaved(requestId, path) This handler is called after the image with \a requestId has been written to the filesystem. The \a path is a local file path, not a URL. @@ -336,7 +336,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant & /*! - \qmlsignal QtMultimedia5::CameraCapture::onImageMetadataAvailable(requestId, key, value) + \qmlsignal QtMultimedia::CameraCapture::onImageMetadataAvailable(requestId, key, value) This handler is called when the image with \a requestId has new metadata available with the key \a key and value \a value. diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index c92b35251..ea1b92f99 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -124,7 +124,7 @@ QDeclarativeCameraExposure::~QDeclarativeCameraExposure() This property holds the adjustment value for the automatically calculated exposure. The value is in EV units. */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::exposureCompensation + \qmlproperty real QtMultimedia::CameraExposure::exposureCompensation This property holds the adjustment value for the automatically calculated exposure. The value is in EV units. @@ -144,7 +144,7 @@ void QDeclarativeCameraExposure::setExposureCompensation(qreal ev) This property holds the sensor's ISO sensitivity value. */ /*! - \qmlproperty int QtMultimedia5::CameraExposure::iso + \qmlproperty int QtMultimedia::CameraExposure::iso This property holds the sensor's ISO sensitivity value. */ @@ -161,7 +161,7 @@ int QDeclarativeCameraExposure::isoSensitivity() const */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::shutterSpeed + \qmlproperty real QtMultimedia::CameraExposure::shutterSpeed This property holds the camera's current shutter speed value in seconds. To affect the shutter speed you can use the \l manualShutterSpeed @@ -180,7 +180,7 @@ qreal QDeclarativeCameraExposure::shutterSpeed() const \sa manualAperture, setAutoAperture() */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::aperture + \qmlproperty real QtMultimedia::CameraExposure::aperture This property holds the current lens aperture as an F number (the ratio of the focal length to effective aperture diameter). @@ -202,7 +202,7 @@ qreal QDeclarativeCameraExposure::aperture() const \sa iso, setAutoIsoSensitivity() */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::manualIso + \qmlproperty real QtMultimedia::CameraExposure::manualIso This property holds the ISO settings for capturing photos. @@ -237,7 +237,7 @@ void QDeclarativeCameraExposure::setManualIsoSensitivity(int iso) \l shutterSpeed, setAutoShutterSpeed() */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::manualShutterSpeed + \qmlproperty real QtMultimedia::CameraExposure::manualShutterSpeed This property holds the shutter speed value (in seconds). If the value is less than zero, the camera automatically @@ -272,7 +272,7 @@ void QDeclarativeCameraExposure::setManualShutterSpeed(qreal speed) \l aperture, setAutoAperture() */ /*! - \qmlproperty real QtMultimedia5::CameraExposure::manualAperture + \qmlproperty real QtMultimedia::CameraExposure::manualAperture This property holds the aperture (F number) value for capturing photos. @@ -299,7 +299,7 @@ void QDeclarativeCameraExposure::setManualAperture(qreal aperture) } /*! - \qmlmethod QtMultimedia5::CameraExposure::setAutoAperture() + \qmlmethod QtMultimedia::CameraExposure::setAutoAperture() Turn on auto aperture selection. The manual aperture value is reset to -1.0 */ void QDeclarativeCameraExposure::setAutoAperture() @@ -308,7 +308,7 @@ void QDeclarativeCameraExposure::setAutoAperture() } /*! - \qmlmethod QtMultimedia5::CameraExposure::setAutoShutterSpeed() + \qmlmethod QtMultimedia::CameraExposure::setAutoShutterSpeed() Turn on auto shutter speed selection. The manual shutter speed value is reset to -1.0 */ void QDeclarativeCameraExposure::setAutoShutterSpeed() @@ -317,7 +317,7 @@ void QDeclarativeCameraExposure::setAutoShutterSpeed() } /*! - \qmlmethod QtMultimedia5::CameraExposure::setAutoIsoSensitivity() + \qmlmethod QtMultimedia::CameraExposure::setAutoIsoSensitivity() Turn on auto ISO sensitivity selection. The manual ISO value is reset to -1. */ void QDeclarativeCameraExposure::setAutoIsoSensitivity() @@ -330,7 +330,7 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity() This property holds the camera exposure mode. The mode can one of the values in \l QCameraExposure::ExposureMode. */ /*! - \qmlproperty enumeration QtMultimedia5::CameraExposure::exposureMode + \qmlproperty enumeration QtMultimedia::CameraExposure::exposureMode This property holds the camera exposure mode. @@ -373,7 +373,7 @@ void QDeclarativeCameraExposure::setExposureMode(QDeclarativeCamera::ExposureMod typically defaults to the center \c (0.5, 0.5). */ /*! - \qmlproperty QPointF QtMultimedia5::CameraExposure::spotMeteringPoint + \qmlproperty QPointF QtMultimedia::CameraExposure::spotMeteringPoint The property holds the frame coordinates of the point to use for exposure metering. This point is only used in spot metering mode, and it typically defaults @@ -400,7 +400,7 @@ void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point) The mode can be one of the constants in \l QCameraExposure::MeteringMode. */ /*! - \qmlproperty enumeration QtMultimedia5::CameraExposure::meteringMode + \qmlproperty enumeration QtMultimedia::CameraExposure::meteringMode This property holds the camera metering mode (how exposure is balanced). diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp index 2cc52a966..726465d1f 100644 --- a/src/imports/multimedia/qdeclarativecameraflash.cpp +++ b/src/imports/multimedia/qdeclarativecameraflash.cpp @@ -95,7 +95,7 @@ QDeclarativeCameraFlash::~QDeclarativeCameraFlash() This property indicates whether the flash is charged. */ /*! - \qmlproperty bool QtMultimedia5::CameraFlash::ready + \qmlproperty bool QtMultimedia::CameraFlash::ready This property indicates whether the flash is charged. */ @@ -109,7 +109,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const This property holds the camera flash mode. The mode can be one of the constants in \l QCameraExposure::FlashMode. */ /*! - \qmlproperty enumeration QtMultimedia5::CameraFlash::mode + \qmlproperty enumeration QtMultimedia::CameraFlash::mode This property holds the camera flash mode. @@ -145,13 +145,13 @@ void QDeclarativeCameraFlash::setFlashMode(int mode) } /*! - \qmlsignal QtMultimedia5::CameraFlash::flashModeChanged(int) + \qmlsignal QtMultimedia::CameraFlash::flashModeChanged(int) This signal is emitted when the \c flashMode property is changed. The corresponding handler is \c onFlashModeChanged. */ /*! - \qmlsignal QtMultimedia5::CameraFlash::flashReady(bool) + \qmlsignal QtMultimedia::CameraFlash::flashReady(bool) This signal is emitted when QCameraExposure indicates that the flash is ready to use. The corresponsing handler is \c onFlashReadyChanged. diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index efde616e9..7f0133b6a 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -167,7 +167,7 @@ QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const } /*! - \qmlmethod bool QtMultimedia5::CameraFocus::isFocusModeSupported(mode) const + \qmlmethod bool QtMultimedia::CameraFocus::isFocusModeSupported(mode) const Returns true if the supplied \a mode is a supported focus mode, and false otherwise. @@ -235,7 +235,7 @@ void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCamera::FocusPointMo } /*! - \qmlmethod bool QtMultimedia5::CameraFocus::isFocusPointModeSupported(mode) const + \qmlmethod bool QtMultimedia::CameraFocus::isFocusPointModeSupported(mode) const Returns true if the supplied \a mode is a supported focus point mode, and false otherwise. @@ -255,7 +255,7 @@ bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::Focu */ /*! - \qmlproperty point QtMultimedia5::CameraFocus::customFocusPoint + \qmlproperty point QtMultimedia::CameraFocus::customFocusPoint This property holds the position of custom focus point, in relative frame coordinates: QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) @@ -289,7 +289,7 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point) \endtable */ /*! - \qmlproperty list<focusZone> QtMultimedia5::CameraFocus::focusZones + \qmlproperty list<focusZone> QtMultimedia::CameraFocus::focusZones This property holds the list of current camera focus zones, each including \c area specified in the same coordinates as \l customFocusPoint, diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp index 01ee8c097..5860e028d 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp @@ -95,7 +95,7 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing() } /*! - \qmlproperty enumeration QtMultimedia5::CameraImageProcessing::whiteBalanceMode + \qmlproperty enumeration QtMultimedia::CameraImageProcessing::whiteBalanceMode \table \header \li Value \li Description @@ -127,7 +127,7 @@ void QDeclarativeCameraImageProcessing::setWhiteBalanceMode(QDeclarativeCameraIm } /*! - \qmlproperty qreal QtMultimedia5::CameraImageProcessing::manualWhiteBalance + \qmlproperty qreal QtMultimedia::CameraImageProcessing::manualWhiteBalance The color temperature used when in manual white balance mode (WhiteBalanceManual). The units are Kelvin. @@ -148,7 +148,7 @@ void QDeclarativeCameraImageProcessing::setManualWhiteBalance(qreal colorTemp) c } /*! - \qmlproperty qreal QtMultimedia5::CameraImageProcessing::contrast + \qmlproperty qreal QtMultimedia::CameraImageProcessing::contrast Image contrast adjustment. Valid contrast adjustment values range between -1.0 and 1.0, with a default of 0. @@ -167,7 +167,7 @@ void QDeclarativeCameraImageProcessing::setContrast(qreal value) } /*! - \qmlproperty qreal QtMultimedia5::CameraImageProcessing::saturation + \qmlproperty qreal QtMultimedia::CameraImageProcessing::saturation Image saturation adjustment. Valid saturation adjustment values range between -1.0 and 1.0, the default is 0. @@ -186,7 +186,7 @@ void QDeclarativeCameraImageProcessing::setSaturation(qreal value) } /*! - \qmlproperty qreal QtMultimedia5::CameraImageProcessing::sharpeningLevel + \qmlproperty qreal QtMultimedia::CameraImageProcessing::sharpeningLevel Adjustment of sharpening level applied to image. @@ -207,7 +207,7 @@ void QDeclarativeCameraImageProcessing::setSharpeningLevel(qreal value) } /*! - \qmlproperty qreal QtMultimedia5::CameraImageProcessing::denoisingLevel + \qmlproperty qreal QtMultimedia::CameraImageProcessing::denoisingLevel Adjustment of denoising applied to image. @@ -228,12 +228,12 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value) } /*! - \qmlsignal QtMultimedia5::Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode) + \qmlsignal QtMultimedia::Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode) This signal is emitted when the \c whiteBalanceMode property is changed. */ /*! - \qmlsignal QtMultimedia5::Camera::manualWhiteBalanceChanged(qreal) + \qmlsignal QtMultimedia::Camera::manualWhiteBalanceChanged(qreal) This signal is emitted when the \c manualWhiteBalance property is changed. */ diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp index f7c49db93..9e11731c4 100644 --- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp +++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp @@ -99,7 +99,7 @@ QDeclarativeCameraRecorder::~QDeclarativeCameraRecorder() } /*! - \qmlproperty size QtMultimedia5::CameraRecorder::resolution + \qmlproperty size QtMultimedia::CameraRecorder::resolution This property holds the video frame dimensions to be used for video capture. */ @@ -109,12 +109,12 @@ QSize QDeclarativeCameraRecorder::captureResolution() } /*! - \qmlproperty string QtMultimedia5::CameraRecorder::audioCodec + \qmlproperty string QtMultimedia::CameraRecorder::audioCodec This property holds the audio codec to be used for recording video. Typically this is \c aac or \c amr-wb. - \sa {QtMultimedia5::CameraImageProcessing::whiteBalanceMode}{whileBalanceMode} + \sa {QtMultimedia::CameraImageProcessing::whiteBalanceMode}{whileBalanceMode} */ QString QDeclarativeCameraRecorder::audioCodec() const { @@ -122,7 +122,7 @@ QString QDeclarativeCameraRecorder::audioCodec() const } /*! - \qmlproperty string QtMultimedia5::CameraRecorder::videoCodec + \qmlproperty string QtMultimedia::CameraRecorder::videoCodec This property holds the video codec to be used for recording video. Typically this is \c h264. @@ -133,7 +133,7 @@ QString QDeclarativeCameraRecorder::videoCodec() const } /*! - \qmlproperty string QtMultimedia5::CameraRecorder::mediaContainer + \qmlproperty string QtMultimedia::CameraRecorder::mediaContainer This property holds the media container to be used for recording video. Typically this is \c mp4. @@ -180,7 +180,7 @@ void QDeclarativeCameraRecorder::setMediaContainer(const QString &container) } /*! - \qmlproperty qreal QtMultimedia5::CameraRecorder::frameRate + \qmlproperty qreal QtMultimedia::CameraRecorder::frameRate This property holds the framerate (in frames per second) to be used for recording video. */ @@ -190,7 +190,7 @@ qreal QDeclarativeCameraRecorder::frameRate() const } /*! - \qmlproperty int QtMultimedia5::CameraRecorder::videoBitRate + \qmlproperty int QtMultimedia::CameraRecorder::videoBitRate This property holds the bit rate (in bits per second) to be used for recording video. */ @@ -200,7 +200,7 @@ int QDeclarativeCameraRecorder::videoBitRate() const } /*! - \qmlproperty int QtMultimedia5::CameraRecorder::audioBitRate + \qmlproperty int QtMultimedia::CameraRecorder::audioBitRate This property holds the audio bit rate (in bits per second) to be used for recording video. */ @@ -210,7 +210,7 @@ int QDeclarativeCameraRecorder::audioBitRate() const } /*! - \qmlproperty int QtMultimedia5::CameraRecorder::audioChannels + \qmlproperty int QtMultimedia::CameraRecorder::audioChannels This property indicates the number of audio channels to be encoded while recording video (1 is mono, 2 is stereo). @@ -221,7 +221,7 @@ int QDeclarativeCameraRecorder::audioChannels() const } /*! - \qmlproperty int QtMultimedia5::CameraRecorder::audioSampleRate + \qmlproperty int QtMultimedia::CameraRecorder::audioSampleRate This property holds the sample rate to be used to encode audio while recording video. */ @@ -231,7 +231,7 @@ int QDeclarativeCameraRecorder::audioSampleRate() const } /*! - \qmlproperty enumeration QtMultimedia5::CameraRecorder::videoEncodingMode + \qmlproperty enumeration QtMultimedia::CameraRecorder::videoEncodingMode This property holds the type of encoding method to be used for recording video. @@ -257,7 +257,7 @@ QDeclarativeCameraRecorder::EncodingMode QDeclarativeCameraRecorder::videoEncodi } /*! - \qmlproperty enumeration QtMultimedia5::CameraRecorder::audioEncodingMode + \qmlproperty enumeration QtMultimedia::CameraRecorder::audioEncodingMode The type of encoding method to use when recording audio. @@ -343,7 +343,7 @@ void QDeclarativeCameraRecorder::setVideoEncodingMode(QDeclarativeCameraRecorder } /*! - \qmlproperty enumeration QtMultimedia5::CameraRecorder::errorCode + \qmlproperty enumeration QtMultimedia::CameraRecorder::errorCode This property holds the last error code. @@ -369,7 +369,7 @@ QDeclarativeCameraRecorder::Error QDeclarativeCameraRecorder::errorCode() const } /*! - \qmlproperty string QtMultimedia5::CameraRecorder::errorString + \qmlproperty string QtMultimedia::CameraRecorder::errorString This property holds the description of the last error. */ @@ -379,7 +379,7 @@ QString QDeclarativeCameraRecorder::errorString() const } /*! - \qmlproperty enumeration QtMultimedia5::CameraRecorder::recorderState + \qmlproperty enumeration QtMultimedia::CameraRecorder::recorderState This property holds the current state of the camera recorder object. @@ -407,7 +407,7 @@ QDeclarativeCameraRecorder::RecorderState QDeclarativeCameraRecorder::recorderSt /*! - \qmlproperty enumeration QtMultimedia5::CameraRecorder::recorderStatus + \qmlproperty enumeration QtMultimedia::CameraRecorder::recorderStatus This property holds the current status of media recording. @@ -438,7 +438,7 @@ QDeclarativeCameraRecorder::RecorderStatus QDeclarativeCameraRecorder::recorderS } /*! - \qmlmethod QtMultimedia5::CameraRecorder::record() + \qmlmethod QtMultimedia::CameraRecorder::record() Starts recording. */ @@ -448,7 +448,7 @@ void QDeclarativeCameraRecorder::record() } /*! - \qmlmethod QtMultimedia5::CameraRecorder::stop() + \qmlmethod QtMultimedia::CameraRecorder::stop() Stops recording. */ @@ -478,7 +478,7 @@ void QDeclarativeCameraRecorder::setRecorderState(QDeclarativeCameraRecorder::Re the recorder uses the system-specific place and file naming scheme. */ /*! - \qmlproperty string QtMultimedia5::CameraRecorder::outputLocation + \qmlproperty string QtMultimedia::CameraRecorder::outputLocation This property holds the destination location of the media content. If the location is empty, the recorder uses the system-specific place and file naming scheme. @@ -496,7 +496,7 @@ QString QDeclarativeCameraRecorder::outputLocation() const new location is set or new recording starts. */ /*! - \qmlproperty string QtMultimedia5::CameraRecorder::actualLocation + \qmlproperty string QtMultimedia::CameraRecorder::actualLocation This property holds the actual location of the last saved media content. The actual location is usually available after the recording starts, and reset when new location is set or the new recording starts. @@ -520,7 +520,7 @@ void QDeclarativeCameraRecorder::setOutputLocation(const QString &location) This property holds the duration (in miliseconds) of the last recording. */ /*! - \qmlproperty int QtMultimedia5::CameraRecorder::duration + \qmlproperty int QtMultimedia::CameraRecorder::duration This property holds the duration (in miliseconds) of the last recording. */ @@ -535,7 +535,7 @@ qint64 QDeclarativeCameraRecorder::duration() const recording. */ /*! - \qmlproperty bool QtMultimedia5::CameraRecorder::muted + \qmlproperty bool QtMultimedia::CameraRecorder::muted This property indicates whether the audio input is muted during recording. */ @@ -550,7 +550,7 @@ void QDeclarativeCameraRecorder::setMuted(bool muted) } /*! - \qmlmethod QtMultimedia5::CameraRecorder::setMetadata(key, value) + \qmlmethod QtMultimedia::CameraRecorder::setMetadata(key, value) Sets metadata for the next video to be recorder, with the given \a key being associated with \a value. diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index 93ed68abe..26620f302 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -126,7 +126,7 @@ QDeclarativeRadio::~QDeclarativeRadio() } /*! - \qmlproperty enumeration QtMultimedia5::Radio::state + \qmlproperty enumeration QtMultimedia::Radio::state This property holds the current state of the Radio. @@ -148,7 +148,7 @@ QDeclarativeRadio::State QDeclarativeRadio::state() const } /*! - \qmlproperty enumeration QtMultimedia5::Radio::band + \qmlproperty enumeration QtMultimedia::Radio::band This property holds the frequency band used for the radio, which can be specified as any one of the values in the table below. @@ -178,7 +178,7 @@ QDeclarativeRadio::Band QDeclarativeRadio::band() const } /*! - \qmlproperty int QtMultimedia5::Radio::frequency + \qmlproperty int QtMultimedia::Radio::frequency Sets the frequency in Hertz that the radio is tuned to. The frequency must be within the frequency range for the current band, otherwise it will be changed to be within the frequency range. @@ -191,7 +191,7 @@ int QDeclarativeRadio::frequency() const } /*! - \qmlproperty enumeration QtMultimedia5::Radio::stereoMode + \qmlproperty enumeration QtMultimedia::Radio::stereoMode This property holds the stereo mode of the radio, which can be set to any one of the values in the table below. @@ -215,7 +215,7 @@ QDeclarativeRadio::StereoMode QDeclarativeRadio::stereoMode() const } /*! - \qmlproperty int QtMultimedia5::Radio::volume + \qmlproperty int QtMultimedia::Radio::volume Set this property to control the volume of the radio. The valid range of the volume is from 0 to 100. */ @@ -225,7 +225,7 @@ int QDeclarativeRadio::volume() const } /*! - \qmlproperty bool QtMultimedia5::Radio::muted + \qmlproperty bool QtMultimedia::Radio::muted This property reflects whether the radio is muted or not. */ @@ -235,7 +235,7 @@ bool QDeclarativeRadio::muted() const } /*! - \qmlproperty bool QtMultimedia5::Radio::stereo + \qmlproperty bool QtMultimedia::Radio::stereo This property holds whether the radio is receiving a stereo signal or not. If \l stereoMode is set to ForceMono the value will always be false. Likewise, it will always be true if stereoMode @@ -249,7 +249,7 @@ bool QDeclarativeRadio::stereo() const } /*! - \qmlproperty int QtMultimedia5::Radio::signalStrength + \qmlproperty int QtMultimedia::Radio::signalStrength The strength of the current radio signal as a percentage where 0% equals no signal, and 100% is a very good signal. @@ -260,7 +260,7 @@ int QDeclarativeRadio::signalStrength() const } /*! - \qmlproperty bool QtMultimedia5::Radio::searching + \qmlproperty bool QtMultimedia::Radio::searching This property is true if the radio is currently searching for radio stations, for instance using the \l scanUp, \l scanDown, and \l searchAllStations methods. Once the search completes, or if it is cancelled using @@ -272,7 +272,7 @@ bool QDeclarativeRadio::searching() const } /*! - \qmlproperty int QtMultimedia5::Radio::frequencyStep + \qmlproperty int QtMultimedia::Radio::frequencyStep The number of Hertz for each step when tuning the radio manually. The value is for the current \l band. */ @@ -282,7 +282,7 @@ int QDeclarativeRadio::frequencyStep() const } /*! - \qmlproperty int QtMultimedia5::Radio::minimumFrequency + \qmlproperty int QtMultimedia::Radio::minimumFrequency The minimum frequency for the current \l band. */ @@ -292,7 +292,7 @@ int QDeclarativeRadio::minimumFrequency() const } /*! - \qmlproperty int QtMultimedia5::Radio::maximumFrequency + \qmlproperty int QtMultimedia::Radio::maximumFrequency The maximum frequency for the current \l band. */ @@ -302,7 +302,7 @@ int QDeclarativeRadio::maximumFrequency() const } /*! - \qmlproperty int QtMultimedia5::Radio::antennaConnected + \qmlproperty int QtMultimedia::Radio::antennaConnected This property is true if there is an antenna connected. Otherwise it will be false. */ @@ -312,7 +312,7 @@ bool QDeclarativeRadio::isAntennaConnected() const } /*! - \qmlproperty enumeration QtMultimedia5::Radio::availability + \qmlproperty enumeration QtMultimedia::Radio::availability Returns the availability state of the radio. @@ -367,7 +367,7 @@ void QDeclarativeRadio::setMuted(bool muted) } /*! - \qmlmethod QtMultimedia5::Radio::cancelScan() + \qmlmethod QtMultimedia::Radio::cancelScan() Cancel the current scan. Will also cancel a search started with \l searchAllStations. */ @@ -377,7 +377,7 @@ void QDeclarativeRadio::cancelScan() } /*! - \qmlmethod QtMultimedia5::Radio::scanDown() + \qmlmethod QtMultimedia::Radio::scanDown() Searches backward in the frequency range for the current band. */ @@ -387,7 +387,7 @@ void QDeclarativeRadio::scanDown() } /*! - \qmlmethod QtMultimedia5::Radio::scanUp() + \qmlmethod QtMultimedia::Radio::scanUp() Searches forward in the frequency range for the current band. */ @@ -397,7 +397,7 @@ void QDeclarativeRadio::scanUp() } /*! - \qmlmethod QtMultimedia5::Radio::searchAllStations(enumeration searchMode) + \qmlmethod QtMultimedia::Radio::searchAllStations(enumeration searchMode) Start searching the complete frequency range for the current band, and save all the radio stations found. The search mode can be either of the values described in the @@ -461,7 +461,7 @@ void QDeclarativeRadio::searchAllStations(QDeclarativeRadio::SearchMode searchMo } /*! - \qmlmethod QtMultimedia5::Radio::tuneDown() + \qmlmethod QtMultimedia::Radio::tuneDown() Decrements the frequency by the frequency step for the current band. If the frequency is already set to the minimum frequency, calling this function has no effect. @@ -476,7 +476,7 @@ void QDeclarativeRadio::tuneDown() } /*! - \qmlmethod QtMultimedia5::Radio::tuneUp() + \qmlmethod QtMultimedia::Radio::tuneUp() Increments the frequency by the frequency step for the current band. If the frequency is already set to the maximum frequency, calling this function has no effect. @@ -491,7 +491,7 @@ void QDeclarativeRadio::tuneUp() } /*! - \qmlmethod QtMultimedia5::Radio::start() + \qmlmethod QtMultimedia::Radio::start() Starts the radio. If the radio is available, as determined by the \l availability property, this will result in the \l state becoming \c ActiveState. @@ -502,7 +502,7 @@ void QDeclarativeRadio::start() } /*! - \qmlmethod QtMultimedia5::Radio::stop() + \qmlmethod QtMultimedia::Radio::stop() Stops the radio. After calling this method the \l state will be \c StoppedState. */ @@ -533,7 +533,7 @@ void QDeclarativeRadio::_q_availabilityChanged(QMultimedia::AvailabilityStatus a } /*! - \qmlsignal QtMultimedia5::Radio::stationFound(int frequency, string stationId) + \qmlsignal QtMultimedia::Radio::stationFound(int frequency, string stationId) This signal is emitted when a new radio station is found. This signal is only emitted if \l searchAllStations is called with \c SearchGetStationId. diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index 1e125bad6..48c7476de 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -120,7 +120,7 @@ QDeclarativeRadioData::~QDeclarativeRadioData() } /*! - \qmlproperty enumeration QtMultimedia5::RadioData::availability + \qmlproperty enumeration QtMultimedia::RadioData::availability Returns the availability state of the radio data interface. @@ -147,7 +147,7 @@ QDeclarativeRadioData::Availability QDeclarativeRadioData::availability() const /*! - \qmlproperty string QtMultimedia5::RadioData::stationId + \qmlproperty string QtMultimedia::RadioData::stationId This property allows you to read the station Id of the currently tuned radio station. @@ -158,7 +158,7 @@ QString QDeclarativeRadioData::stationId() const } /*! - \qmlproperty enumeration QtMultimedia5::RadioData::programType + \qmlproperty enumeration QtMultimedia::RadioData::programType This property holds the type of the currently playing program as transmitted by the radio station. The value can be any one of the values defined in the @@ -223,7 +223,7 @@ QDeclarativeRadioData::ProgramType QDeclarativeRadioData::programType() const } /*! - \qmlproperty string QtMultimedia5::RadioData::programTypeName + \qmlproperty string QtMultimedia::RadioData::programTypeName This property holds a string representation of the \l programType. */ @@ -233,7 +233,7 @@ QString QDeclarativeRadioData::programTypeName() const } /*! - \qmlproperty string QtMultimedia5::RadioData::stationName + \qmlproperty string QtMultimedia::RadioData::stationName This property has the name of the currently tuned radio station. */ @@ -243,7 +243,7 @@ QString QDeclarativeRadioData::stationName() const } /*! - \qmlproperty string QtMultimedia5::RadioData::radioText + \qmlproperty string QtMultimedia::RadioData::radioText This property holds free-text transmitted by the radio station. This is typically used to show supporting information for the currently playing content, for instance song title or @@ -255,7 +255,7 @@ QString QDeclarativeRadioData::radioText() const } /*! - \qmlproperty bool QtMultimedia5::RadioData::alternativeFrequenciesEnabled + \qmlproperty bool QtMultimedia::RadioData::alternativeFrequenciesEnabled This property allows you to specify whether the radio should try and tune to alternative frequencies if the signal strength of the current station becomes too weak. The alternative diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index 462183f8c..2cbe3ca81 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -92,7 +92,7 @@ QDeclarativeTorch::~QDeclarativeTorch() } /*! - \qmlproperty bool QtMultimedia5::Torch::enabled + \qmlproperty bool QtMultimedia::Torch::enabled This property indicates whether the torch is enabled. If the torch functionality is shared with the camera flash hardware, the camera will take priority @@ -140,7 +140,7 @@ void QDeclarativeTorch::setEnabled(bool on) } /*! - \qmlproperty int QtMultimedia5::Torch::power + \qmlproperty int QtMultimedia::Torch::power This property holds the current torch power setting, as a percentage of full power. diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp index 91d15beff..07c78b790 100644 --- a/src/imports/multimedia/qdeclarativevideooutput.cpp +++ b/src/imports/multimedia/qdeclarativevideooutput.cpp @@ -143,7 +143,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput() } /*! - \qmlproperty variant QtMultimedia5::VideoOutput::source + \qmlproperty variant QtMultimedia::VideoOutput::source This property holds the source item providing the video frames like MediaPlayer or Camera. @@ -265,7 +265,7 @@ void QDeclarativeVideoOutput::_q_updateMediaObject() } /*! - \qmlproperty enumeration QtMultimedia5::VideoOutput::fillMode + \qmlproperty enumeration QtMultimedia::VideoOutput::fillMode Set this property to define how the video is scaled to fit the target area. @@ -359,7 +359,7 @@ void QDeclarativeVideoOutput::_q_screenOrientationChanged(int orientation) } /*! - \qmlproperty int QtMultimedia5::VideoOutput::orientation + \qmlproperty int QtMultimedia::VideoOutput::orientation In some cases the source video stream requires a certain orientation to be correct. This includes @@ -420,7 +420,7 @@ void QDeclarativeVideoOutput::setOrientation(int orientation) } /*! - \qmlproperty int QtMultimedia5::VideoOutput::autoOrientation + \qmlproperty int QtMultimedia::VideoOutput::autoOrientation This property allows you to enable and disable auto orientation of the video stream, so that its orientation always matches @@ -459,7 +459,7 @@ void QDeclarativeVideoOutput::setAutoOrientation(bool autoOrientation) } /*! - \qmlproperty rectangle QtMultimedia5::VideoOutput::contentRect + \qmlproperty rectangle QtMultimedia::VideoOutput::contentRect This property holds the item coordinates of the area that would contain video to render. With certain fill modes, @@ -480,7 +480,7 @@ QRectF QDeclarativeVideoOutput::contentRect() const } /*! - \qmlproperty rectangle QtMultimedia5::VideoOutput::sourceRect + \qmlproperty rectangle QtMultimedia::VideoOutput::sourceRect This property holds the area of the source video content that is considered for rendering. The @@ -520,7 +520,7 @@ QRectF QDeclarativeVideoOutput::sourceRect() const } /*! - \qmlmethod QPointF QtMultimedia5::VideoOutput::mapNormalizedPointToItem (const QPointF &point) const + \qmlmethod QPointF QtMultimedia::VideoOutput::mapNormalizedPointToItem (const QPointF &point) const Given normalized coordinates \a point (that is, each component in the range of 0 to 1.0), return the mapped point @@ -557,7 +557,7 @@ QPointF QDeclarativeVideoOutput::mapNormalizedPointToItem(const QPointF &point) } /*! - \qmlmethod QRectF QtMultimedia5::VideoOutput::mapNormalizedRectToItem(const QRectF &rectangle) const + \qmlmethod QRectF QtMultimedia::VideoOutput::mapNormalizedRectToItem(const QRectF &rectangle) const Given a rectangle \a rectangle in normalized coordinates (that is, each component in the range of 0 to 1.0), @@ -574,7 +574,7 @@ QRectF QDeclarativeVideoOutput::mapNormalizedRectToItem(const QRectF &rectangle) } /*! - \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItem(const QPointF &point) const + \qmlmethod QPointF QtMultimedia::VideoOutput::mapPointToItem(const QPointF &point) const Given a point \a point in item coordinates, return the corresponding point in source coordinates. This mapping is @@ -594,7 +594,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSource(const QPointF &point) const } /*! - \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToSource(const QRectF &rectangle) const + \qmlmethod QRectF QtMultimedia::VideoOutput::mapRectToSource(const QRectF &rectangle) const Given a rectangle \a rectangle in item coordinates, return the corresponding rectangle in source coordinates. This mapping is @@ -612,7 +612,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSource(const QRectF &rectangle) const } /*! - \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItemNormalized(const QPointF &point) const + \qmlmethod QPointF QtMultimedia::VideoOutput::mapPointToItemNormalized(const QPointF &point) const Given a point \a point in item coordinates, return the corresponding point in normalized source coordinates. This mapping is @@ -647,7 +647,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSourceNormalized(const QPointF &point } /*! - \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToSourceNormalized(const QRectF &rectangle) const + \qmlmethod QRectF QtMultimedia::VideoOutput::mapRectToSourceNormalized(const QRectF &rectangle) const Given a rectangle \a rectangle in item coordinates, return the corresponding rectangle in normalized source coordinates. This mapping is @@ -670,7 +670,7 @@ QDeclarativeVideoOutput::SourceType QDeclarativeVideoOutput::sourceType() const } /*! - \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItem(const QPointF &point) const + \qmlmethod QPointF QtMultimedia::VideoOutput::mapPointToItem(const QPointF &point) const Given a point \a point in source coordinates, return the corresponding point in item coordinates. This mapping is @@ -693,7 +693,7 @@ QPointF QDeclarativeVideoOutput::mapPointToItem(const QPointF &point) const } /*! - \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToItem(const QRectF &rectangle) const + \qmlmethod QRectF QtMultimedia::VideoOutput::mapRectToItem(const QRectF &rectangle) const Given a rectangle \a rectangle in source coordinates, return the corresponding rectangle in item coordinates. This mapping is diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index 0f24dd5d8..437d3a4e6 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -149,7 +149,7 @@ QStringList QSoundEffect::supportedMimeTypes() } /*! - \qmlproperty url QtMultimedia5::SoundEffect::source + \qmlproperty url QtMultimedia::SoundEffect::source This property holds the url for the sound to play. For the SoundEffect to attempt to load the source, the URL must exist and the application must have read permission @@ -182,7 +182,7 @@ void QSoundEffect::setSource(const QUrl &url) } /*! - \qmlproperty int QtMultimedia5::SoundEffect::loops + \qmlproperty int QtMultimedia::SoundEffect::loops This property provides a way to control the number of times to repeat the sound on each play(). @@ -232,7 +232,7 @@ void QSoundEffect::setLoopCount(int loopCount) } /*! - \qmlproperty int QtMultimedia5::SoundEffect::loopsRemaining + \qmlproperty int QtMultimedia::SoundEffect::loopsRemaining This property contains the number of loops remaining before the sound effect stops by itself, or SoundEffect.Infinite if that's what has been set in \l loops. @@ -250,7 +250,7 @@ int QSoundEffect::loopsRemaining() const /*! - \qmlproperty qreal QtMultimedia5::SoundEffect::volume + \qmlproperty qreal QtMultimedia::SoundEffect::volume This property holds the volume of the sound effect playback, from 0.0 (silent) to 1.0 (maximum volume). */ @@ -285,7 +285,7 @@ void QSoundEffect::setVolume(qreal volume) } /*! - \qmlproperty bool QtMultimedia5::SoundEffect::muted + \qmlproperty bool QtMultimedia::SoundEffect::muted This property provides a way to control muting. A value of \c true will mute this effect. Otherwise, playback will occur with the currently specified \l volume. @@ -323,7 +323,7 @@ void QSoundEffect::setMuted(bool muted) Returns whether the sound effect has finished loading the \l source(). */ /*! - \qmlmethod bool QtMultimedia5::SoundEffect::isLoaded() + \qmlmethod bool QtMultimedia::SoundEffect::isLoaded() Returns whether the sound effect has finished loading the \l source. */ @@ -333,7 +333,7 @@ bool QSoundEffect::isLoaded() const } /*! - \qmlmethod QtMultimedia5::SoundEffect::play() + \qmlmethod QtMultimedia::SoundEffect::play() Start playback of the sound effect, looping the effect for the number of times as specified in the loops property. @@ -354,7 +354,7 @@ void QSoundEffect::play() } /*! - \qmlproperty bool QtMultimedia5::SoundEffect::playing + \qmlproperty bool QtMultimedia::SoundEffect::playing This property indicates whether the sound effect is playing or not. */ @@ -381,7 +381,7 @@ bool QSoundEffect::isPlaying() const */ /*! - \qmlproperty enumeration QtMultimedia5::SoundEffect::status + \qmlproperty enumeration QtMultimedia::SoundEffect::status This property indicates the current status of the SoundEffect as enumerated within SoundEffect. @@ -411,7 +411,7 @@ QSoundEffect::Status QSoundEffect::status() const } /*! - \qmlproperty string QtMultimedia5::SoundEffect::category + \qmlproperty string QtMultimedia::SoundEffect::category This property contains the \e category of this sound effect. @@ -474,7 +474,7 @@ void QSoundEffect::setCategory(const QString &category) /*! - \qmlmethod QtMultimedia5::SoundEffect::stop() + \qmlmethod QtMultimedia::SoundEffect::stop() Stop current playback. @@ -498,7 +498,7 @@ void QSoundEffect::stop() The \c sourceChanged signal is emitted when the source has been changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::sourceChanged() + \qmlsignal QtMultimedia::SoundEffect::sourceChanged() The \c sourceChanged signal is emitted when the source has been changed. @@ -510,7 +510,7 @@ void QSoundEffect::stop() The \c loadedChanged signal is emitted when the loading state has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::loadedChanged() + \qmlsignal QtMultimedia::SoundEffect::loadedChanged() The \c loadedChanged signal is emitted when the loading state has changed. @@ -523,7 +523,7 @@ void QSoundEffect::stop() The \c loopCountChanged signal is emitted when the initial number of loops has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::loopCountChanged() + \qmlsignal QtMultimedia::SoundEffect::loopCountChanged() The \c loopCountChanged signal is emitted when the initial number of loops has changed. @@ -536,7 +536,7 @@ void QSoundEffect::stop() The \c loopsRemainingChanged signal is emitted when the remaining number of loops has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::loopsRemainingChanged() + \qmlsignal QtMultimedia::SoundEffect::loopsRemainingChanged() The \c loopsRemainingChanged signal is emitted when the remaining number of loops has changed. @@ -549,7 +549,7 @@ void QSoundEffect::stop() The \c volumeChanged signal is emitted when the volume has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::volumeChanged() + \qmlsignal QtMultimedia::SoundEffect::volumeChanged() The \c volumeChanged signal is emitted when the volume has changed. @@ -562,7 +562,7 @@ void QSoundEffect::stop() The \c mutedChanged signal is emitted when the mute state has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::mutedChanged() + \qmlsignal QtMultimedia::SoundEffect::mutedChanged() The \c mutedChanged signal is emitted when the mute state has changed. @@ -575,7 +575,7 @@ void QSoundEffect::stop() The \c playingChanged signal is emitted when the playing property has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::playingChanged() + \qmlsignal QtMultimedia::SoundEffect::playingChanged() The \c playingChanged signal is emitted when the playing property has changed. @@ -588,7 +588,7 @@ void QSoundEffect::stop() The \c statusChanged signal is emitted when the status property has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::statusChanged() + \qmlsignal QtMultimedia::SoundEffect::statusChanged() The \c statusChanged signal is emitted when the status property has changed. @@ -601,7 +601,7 @@ void QSoundEffect::stop() The \c categoryChanged signal is emitted when the category property has changed. */ /*! - \qmlsignal QtMultimedia5::SoundEffect::categoryChanged() + \qmlsignal QtMultimedia::SoundEffect::categoryChanged() The \c categoryChanged signal is emitted when the category property has changed. diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index 4cd59fd52..ed5b93dec 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -74,20 +74,20 @@ \li Type \li Description \row - \li \l {QtMultimedia5::Audio}{Audio} + \li \l {QtMultimedia::Audio}{Audio} \li Add audio playback functionality to a scene \row - \li \l {QtMultimedia5::Camera}{Camera} + \li \l {QtMultimedia::Camera}{Camera} \li Access camera viewfinder frames \row \li MediaPlayer \li Add media playback functionality to a scene. It is same as Audio type, but can be used for video playback with the VideoOutput type. \row - \li \l {QtMultimedia5::Radio}{Radio} + \li \l {QtMultimedia::Radio}{Radio} \li Access radio functionality \row - \li \l {QtMultimedia5::Video}{Video} + \li \l {QtMultimedia::Video}{Video} \li Add Video playback functionality to a scene. It uses MediaPlayer and VideoOutput types to provide video playback functionality. \endtable |