slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: Removing version number from the QDoc comments.

Browse Source 
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>
This commit is contained in:
Jerome Pasion
2013-10-01 15:45:57 +02:00
committed by The Qt Project
parent 40908fdb77
commit 43be5d9763
14 changed files with 295 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/multimedia/audio/qsoundeffect.cpp
View File

@@ -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.

8
src/multimedia/doc/src/qtmultimedia-index.qdoc
View File

@@ -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