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

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

Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 2cc58eb6c..17f214a47 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -59,12 +59,11 @@ class AudioTest : public AudioDevicesBase
     Q_OBJECT
 
 public:
-    AudioTest(QWidget *parent = 0);
-    virtual ~AudioTest();
+    explicit AudioTest(QWidget *parent = nullptr);
 
-    QAudioDeviceInfo deviceInfo;
-    QAudioFormat settings;
-    QAudio::Mode mode;
+private:
+    QAudioDeviceInfo m_deviceInfo;
+    QAudioFormat m_settings;
 
 private slots:
     void modeChanged(int idx);