diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2017-09-08 10:38:06 -0400 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@blackberry.com> | 2017-09-19 17:04:05 +0000 |
| commit | bb6166a5eca14550584bfc4ab4cb4130872df3ad (patch) | |
| tree | 550ad6061287ff2920b65e8b36ef1dbad94c4d8d /src | |
| parent | cb4fa0d86a70b0e1751b3e5a238deaf2d63c196e (diff) | |
| download | qtmultimedia-bb6166a5eca14550584bfc4ab4cb4130872df3ad.tar.gz | |
Update customAudioRole Qt version
The change missed the Qt 5.10 release.
Change-Id: I25bc345ac8262966ca31e63f4f87584983fa0bae
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/controls/qcustomaudiorolecontrol.cpp | 6 | ||||
| -rw-r--r-- | src/multimedia/controls/qcustomaudiorolecontrol.h | 2 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.cpp b/src/multimedia/controls/qcustomaudiorolecontrol.cpp index c01fc430c..39431be01 100644 --- a/src/multimedia/controls/qcustomaudiorolecontrol.cpp +++ b/src/multimedia/controls/qcustomaudiorolecontrol.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \class QCustomAudioRoleControl \inmodule QtMultimedia \ingroup multimedia_control - \since 5.10 + \since 5.11 \brief The QCustomAudioRoleControl class provides control over the audio role of a media object. @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QMediaPlayer class. - The interface name of QCustomAudioRoleControl is \c org.qt-project.qt.customaudiorolecontrol/5.10 as + The interface name of QCustomAudioRoleControl is \c org.qt-project.qt.customaudiorolecontrol/5.11 as defined in QCustomAudioRoleControl_iid. \sa QMediaService::requestControl(), QMediaPlayer @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCustomAudioRoleControl_iid - \c org.qt-project.qt.customaudiorolecontrol/5.10 + \c org.qt-project.qt.customaudiorolecontrol/5.11 Defines the interface name of the QCustomAudioRoleControl class. diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.h b/src/multimedia/controls/qcustomaudiorolecontrol.h index d699afe4e..f71bc67df 100644 --- a/src/multimedia/controls/qcustomaudiorolecontrol.h +++ b/src/multimedia/controls/qcustomaudiorolecontrol.h @@ -68,7 +68,7 @@ protected: explicit QCustomAudioRoleControl(QObject *parent = nullptr); }; -#define QCustomAudioRoleControl_iid "org.qt-project.qt.customaudiorolecontrol/5.10" +#define QCustomAudioRoleControl_iid "org.qt-project.qt.customaudiorolecontrol/5.11" Q_MEDIA_DECLARE_CONTROL(QCustomAudioRoleControl, QCustomAudioRoleControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index e1fa31451..52fa6e68e 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -1220,7 +1220,7 @@ void QMediaPlayer::setCustomAudioRole(const QString &audioRole) indicate that the supported custom audio roles aren't known. The list may not be complete. - \since 5.10 + \since 5.11 \sa customAudioRole */ QStringList QMediaPlayer::supportedCustomAudioRoles() const @@ -1345,7 +1345,7 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const Signals that the audio \a role of the media player has changed. - \since 5.10 + \since 5.11 */ // Properties @@ -1549,7 +1549,7 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const audioRole is set to QAudio::CustomRole when this property is set. - \since 5.10 + \since 5.11 \sa supportedCustomAudioRoles() */ |