Merge remote-tracking branch 'origin/dev' into 6.2

Change-Id: I84ab4bc68611159d8e0d211a509e328319b7cb96

1 files changed, 0 insertions, 28 deletions

diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index 2f03f78b2..95cdc02e7 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -152,23 +152,6 @@ bool QAudioOutput::isMuted() const
     return d->muted;
 }
 
-QAudio::Role QAudioOutput::audioRole() const
-{
-    return d->role;
-}
-
-/*!
-    Returns a list of supported audio roles.
-
-    If setting the audio role is not supported, an empty list is returned.
-
-    \sa audioRole
-*/
-QList<QAudio::Role> QAudioOutput::supportedAudioRoles() const
-{
-    return d->supportedAudioRoles();
-}
-
 void QAudioOutput::setMuted(bool muted)
 {
     if (d->muted == muted)
@@ -178,15 +161,4 @@ void QAudioOutput::setMuted(bool muted)
     emit mutedChanged(muted);
 }
 
-void QAudioOutput::setAudioRole(QAudio::Role audioRole)
-{
-    if (d->role == audioRole)
-        return;
-    if (!d->supportedAudioRoles().contains(audioRole))
-        return;
-    d->role = audioRole;
-    d->setAudioRole(d->role);
-    emit audioRoleChanged(d->role);
-}
-
 #include "moc_qaudiooutput.cpp"