Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/avfoundation/mediaplayer/mediaplayer.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro

Change-Id: I5742596230dc510ba2a09eba624429bb67179194

2 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h
index 34e58bbe9..75f95d354 100644
--- a/src/multimedia/recording/qaudiorecorder.h
+++ b/src/multimedia/recording/qaudiorecorder.h
@@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder
     Q_OBJECT
     Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
 public:
-    QAudioRecorder(QObject *parent = 0);
+    explicit QAudioRecorder(QObject *parent = Q_NULLPTR);
     ~QAudioRecorder();
 
     QStringList audioInputs() const;
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index a06c1ce70..3ac25129b 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -106,7 +106,7 @@ public:
         OutOfSpaceError
     };
 
-    QMediaRecorder(QMediaObject *mediaObject, QObject *parent = 0);
+    explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
     ~QMediaRecorder();
 
     QMediaObject *mediaObject() const;
@@ -137,16 +137,16 @@ public:
     QString audioCodecDescription(const QString &codecName) const;
 
     QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(),
-                                         bool *continuous = 0) const;
+                                         bool *continuous = Q_NULLPTR) const;
 
     QStringList supportedVideoCodecs() const;
     QString videoCodecDescription(const QString &codecName) const;
 
     QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
-                                      bool *continuous = 0) const;
+                                      bool *continuous = Q_NULLPTR) const;
 
     QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
-                                     bool *continuous = 0) const;
+                                     bool *continuous = Q_NULLPTR) const;
 
     QAudioEncoderSettings audioSettings() const;
     QVideoEncoderSettings videoSettings() const;
@@ -193,7 +193,7 @@ Q_SIGNALS:
     void availabilityChanged(QMultimedia::AvailabilityStatus availability);
 
 protected:
-    QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
+    QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
     bool setMediaObject(QMediaObject *object);
 
     QMediaRecorderPrivate *d_ptr;