10 files changed, 20 insertions, 15 deletions
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
index dea9a05a5..82613270a 100644
--- a/src/multimedia/audio/qaudio.cpp
+++ b/src/multimedia/audio/qaudio.cpp
@@ -115,6 +115,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
     \value AccessibilityRole        For accessibility, such as with a screen reader
     \value SonificationRole         Sonification, such as with user interface sounds
     \value GameRole                 Game audio
+    \value CustomRole               The role is specified by QMediaPlayer::customAudioRole()
 
     \since 5.6
     \sa QMediaPlayer::setAudioRole()
@@ -347,6 +348,9 @@ QDebug operator<<(QDebug dbg, QAudio::Role role)
     case QAudio::VoiceCommunicationRole:
         dbg << "VoiceCommunicationRole";
         break;
+    case QAudio::CustomRole:
+        dbg << "CustomRole";
+        break;
     }
     return dbg;
 }
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 2603d71d1..90a8c236f 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -68,7 +68,8 @@ namespace QAudio
         RingtoneRole,
         AccessibilityRole,
         SonificationRole,
-        GameRole
+        GameRole,
+        CustomRole
     };
 
     enum VolumeScale {
diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp
index fe07d1e47..849d79ab3 100644
--- a/src/multimedia/audio/qaudiobuffer.cpp
+++ b/src/multimedia/audio/qaudiobuffer.cpp
@@ -531,32 +531,32 @@ void *QAudioBuffer::data()
 */
 
 /*!
-    \fn QAudioBuffer::StereoFrame::StereoFrame()
+    \fn template <typename T> QAudioBuffer::StereoFrame<T>::StereoFrame()
 
     Constructs a new frame with the "silent" value for this
     sample format (0 for signed formats and floats, 0x8* for unsigned formats).
 */
 
 /*!
-    \fn QAudioBuffer::StereoFrame::StereoFrame(T leftSample, T rightSample)
+    \fn template <typename T> QAudioBuffer::StereoFrame<T>::StereoFrame(T leftSample, T rightSample)
 
     Constructs a new frame with the supplied \a leftSample and \a rightSample values.
 */
 
 /*!
-    \fn QAudioBuffer::StereoFrame::operator=(const StereoFrame &other)
+    \fn template <typename T> QAudioBuffer::StereoFrame<T>::operator=(const StereoFrame &other)
 
     Assigns \a other to this frame.
  */
 
 
 /*!
-    \fn QAudioBuffer::StereoFrame::average() const
+    \fn template <typename T> QAudioBuffer::StereoFrame<T>::average() const
 
     Returns the arithmetic average of the left and right samples.
  */
 
-/*! \fn QAudioBuffer::StereoFrame::clear()
+/*! \fn template <typename T> QAudioBuffer::StereoFrame<T>::clear()
 
     Sets the values of this frame to the "silent" value.
 */
diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h
index 85e0b75f7..4ba107946 100644
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -75,7 +75,7 @@ public:
         ServiceMissingError
     };
 
-    explicit QAudioDecoder(QObject *parent = Q_NULLPTR);
+    explicit QAudioDecoder(QObject *parent = nullptr);
     ~QAudioDecoder();
 
     static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList());
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index 5794276d2..db482a145 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -62,8 +62,8 @@ class Q_MULTIMEDIA_EXPORT QAudioInput : public QObject
     Q_OBJECT
 
 public:
-    explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
-    explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
+    explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
     ~QAudioInput();
 
     QAudioFormat format() const;
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index 9f817271d..1c037cd2b 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -62,8 +62,8 @@ class Q_MULTIMEDIA_EXPORT QAudioOutput : public QObject
     Q_OBJECT
 
 public:
-    explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
-    explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
+    explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
     ~QAudioOutput();
 
     QAudioFormat format() const;
diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h
index 376a54e34..a3fc4598d 100644
--- a/src/multimedia/audio/qaudioprobe.h
+++ b/src/multimedia/audio/qaudioprobe.h
@@ -53,7 +53,7 @@ class Q_MULTIMEDIA_EXPORT QAudioProbe : public QObject
 {
     Q_OBJECT
 public:
-    explicit QAudioProbe(QObject *parent = Q_NULLPTR);
+    explicit QAudioProbe(QObject *parent = nullptr);
     ~QAudioProbe();
 
     bool setSource(QMediaObject *source);
diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index e304f1c46..3539201a2 100644
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -78,7 +78,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSyst
     Q_INTERFACES(QAudioSystemFactoryInterface)
 
 public:
-    explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR);
+    explicit QAudioSystemPlugin(QObject *parent = nullptr);
     ~QAudioSystemPlugin();
 
     QList<QByteArray> availableDevices(QAudio::Mode) const override = 0;
diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h
index 304019ced..0b6320025 100644
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -58,7 +58,7 @@ public:
 
     static void play(const QString& filename);
 
-    explicit QSound(const QString &filename, QObject *parent = Q_NULLPTR);
+    explicit QSound(const QString &filename, QObject *parent = nullptr);
     ~QSound();
 
     int loops() const;
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index 7420d7b81..8bde1fe56 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -80,7 +80,7 @@ public:
         Error
     };
 
-    explicit QSoundEffect(QObject *parent = Q_NULLPTR);
+    explicit QSoundEffect(QObject *parent = nullptr);
     ~QSoundEffect();
 
     static QStringList supportedMimeTypes();