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

Conflicts:
	.qmake.conf
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26

4 files changed, 20 insertions, 20 deletions

diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp
index adaa41c6e..a0a7bf08f 100644
--- a/src/plugins/alsa/qalsaaudioinput.cpp
+++ b/src/plugins/alsa/qalsaaudioinput.cpp
@@ -244,7 +244,7 @@ QIODevice* QAlsaAudioInput::start()
         delete audioSource;
 
     pullMode = false;
-    audioSource = new InputPrivate(this);
+    audioSource = new AlsaInputPrivate(this);
     audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
 
     deviceState = QAudio::IdleState;
@@ -725,7 +725,7 @@ bool QAlsaAudioInput::deviceReady()
         read(0, buffer_size);
     } else {
         // emits readyRead() so user will call read() on QIODevice to get some audio data
-        InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
+        AlsaInputPrivate* a = qobject_cast<AlsaInputPrivate*>(audioSource);
         a->trigger();
     }
     bytesAvailable = checkBytesReady();
@@ -777,28 +777,28 @@ void QAlsaAudioInput::drain()
         snd_pcm_drain(handle);
 }
 
-InputPrivate::InputPrivate(QAlsaAudioInput* audio)
+AlsaInputPrivate::AlsaInputPrivate(QAlsaAudioInput* audio)
 {
     audioDevice = qobject_cast<QAlsaAudioInput*>(audio);
 }
 
-InputPrivate::~InputPrivate()
+AlsaInputPrivate::~AlsaInputPrivate()
 {
 }
 
-qint64 InputPrivate::readData( char* data, qint64 len)
+qint64 AlsaInputPrivate::readData( char* data, qint64 len)
 {
     return audioDevice->read(data,len);
 }
 
-qint64 InputPrivate::writeData(const char* data, qint64 len)
+qint64 AlsaInputPrivate::writeData(const char* data, qint64 len)
 {
     Q_UNUSED(data)
     Q_UNUSED(len)
     return 0;
 }
 
-void InputPrivate::trigger()
+void AlsaInputPrivate::trigger()
 {
     emit readyRead();
 }
diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h
index 19af68950..1c09dc70f 100644
--- a/src/plugins/alsa/qalsaaudioinput.h
+++ b/src/plugins/alsa/qalsaaudioinput.h
@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class InputPrivate;
+class AlsaInputPrivate;
 
 class RingBuffer
 {
@@ -158,12 +158,12 @@ private:
     qreal m_volume;
 };
 
-class InputPrivate : public QIODevice
+class AlsaInputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    InputPrivate(QAlsaAudioInput* audio);
-    ~InputPrivate();
+    AlsaInputPrivate(QAlsaAudioInput* audio);
+    ~AlsaInputPrivate();
 
     qint64 readData( char* data, qint64 len);
     qint64 writeData(const char* data, qint64 len);
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp
index fde2bc9bf..c9c024aed 100644
--- a/src/plugins/alsa/qalsaaudiooutput.cpp
+++ b/src/plugins/alsa/qalsaaudiooutput.cpp
@@ -247,7 +247,7 @@ QIODevice* QAlsaAudioOutput::start()
 
     close();
 
-    audioSource = new OutputPrivate(this);
+    audioSource = new AlsaOutputPrivate(this);
     audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered);
     pullMode = false;
 
@@ -785,14 +785,14 @@ void QAlsaAudioOutput::reset()
     stop();
 }
 
-OutputPrivate::OutputPrivate(QAlsaAudioOutput* audio)
+AlsaOutputPrivate::AlsaOutputPrivate(QAlsaAudioOutput* audio)
 {
     audioDevice = qobject_cast<QAlsaAudioOutput*>(audio);
 }
 
-OutputPrivate::~OutputPrivate() {}
+AlsaOutputPrivate::~AlsaOutputPrivate() {}
 
-qint64 OutputPrivate::readData( char* data, qint64 len)
+qint64 AlsaOutputPrivate::readData( char* data, qint64 len)
 {
     Q_UNUSED(data)
     Q_UNUSED(len)
@@ -800,7 +800,7 @@ qint64 OutputPrivate::readData( char* data, qint64 len)
     return 0;
 }
 
-qint64 OutputPrivate::writeData(const char* data, qint64 len)
+qint64 AlsaOutputPrivate::writeData(const char* data, qint64 len)
 {
     int retry = 0;
     qint64 written = 0;
diff --git a/src/plugins/alsa/qalsaaudiooutput.h b/src/plugins/alsa/qalsaaudiooutput.h
index 243729f7e..be2adb840 100644
--- a/src/plugins/alsa/qalsaaudiooutput.h
+++ b/src/plugins/alsa/qalsaaudiooutput.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 class QAlsaAudioOutput : public QAbstractAudioOutput
 {
-    friend class OutputPrivate;
+    friend class AlsaOutputPrivate;
     Q_OBJECT
 public:
     QAlsaAudioOutput(const QByteArray &device);
@@ -137,13 +137,13 @@ private:
     qreal m_volume;
 };
 
-class OutputPrivate : public QIODevice
+class AlsaOutputPrivate : public QIODevice
 {
     friend class QAlsaAudioOutput;
     Q_OBJECT
 public:
-    OutputPrivate(QAlsaAudioOutput* audio);
-    ~OutputPrivate();
+    AlsaOutputPrivate(QAlsaAudioOutput* audio);
+    ~AlsaOutputPrivate();
 
     qint64 readData( char* data, qint64 len);
     qint64 writeData(const char* data, qint64 len);