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

 Conflicts:
	src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h

Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d

1 files changed, 7 insertions, 8 deletions

diff --git a/examples/multimedia/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
index 7c8040299..9df86cac4 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.h
+++ b/examples/multimedia/audiorecorder/audiorecorder.h
@@ -52,15 +52,14 @@ class QAudioProbe;
 class QAudioBuffer;
 QT_END_NAMESPACE
 
-class QAudioLevel;
+class AudioLevel;
 
 class AudioRecorder : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    AudioRecorder(QWidget *parent = 0);
-    ~AudioRecorder();
+    AudioRecorder();
 
 public slots:
     void processBuffer(const QAudioBuffer&);
@@ -78,12 +77,12 @@ private slots:
 private:
     void clearAudioLevels();
 
-    Ui::AudioRecorder *ui;
+    Ui::AudioRecorder *ui = nullptr;
 
-    QAudioRecorder *audioRecorder;
-    QAudioProbe *probe;
-    QList<QAudioLevel*> audioLevels;
-    bool outputLocationSet;
+    QAudioRecorder *m_audioRecorder = nullptr;
+    QAudioProbe *m_probe = nullptr;
+    QList<AudioLevel*> m_audioLevels;
+    bool m_outputLocationSet = false;
 
 };