diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:20 +0200 |
| commit | 87d4252f36ee85615c72d8ba21008ba4018b841d (patch) | |
| tree | f657f421ef7ac567f0b5dc60fdcd7f7534f73413 /src/multimedia/controls/qmediaplayercontrol.cpp | |
| parent | 3064d50f0e58599dbb9818a1c558b4ad77e47350 (diff) | |
| parent | 0bc28be67c2854a4c06cddd536e43ac87c225670 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7f644741677dbd848d480dde7c76cdf7ad81e4b9
Diffstat (limited to 'src/multimedia/controls/qmediaplayercontrol.cpp')
| -rw-r--r-- | src/multimedia/controls/qmediaplayercontrol.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index 07b277ffb..15f9e7d49 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -104,9 +104,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State state) + \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State newState) - Signals that the \a state of a player control has changed. + Signals that the state of a player control has changed to \a newState. \sa state() */ @@ -215,9 +215,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::bufferStatusChanged(int progress) + \fn QMediaPlayerControl::bufferStatusChanged(int percentFilled) - Signals that buffering \a progress has changed. + Signal the amount of the local buffer filled as a percentage by \a percentFilled. \sa bufferStatus() */ @@ -231,9 +231,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::audioAvailableChanged(bool audio) + \fn QMediaPlayerControl::audioAvailableChanged(bool audioAvailable) - Signals that there has been a change in the availability of \a audio output. + Signals that there has been a change in the availability of audio output \a audioAvailable. \sa isAudioAvailable() */ @@ -247,9 +247,9 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): */ /*! - \fn QMediaPlayerControl::videoAvailableChanged(bool video) + \fn QMediaPlayerControl::videoAvailableChanged(bool videoAvailable) - Signals that there has been a change in the availability of \a video output. + Signal that the availability of visual content has changed to \a videoAvailable. \sa isVideoAvailable() */ |