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

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

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.h b/src/plugins/pulseaudio/qaudioinput_pulse.h
index 4e92447f6..8590aa281 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.h
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.h
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class InputPrivate;
+class PulseInputPrivate;
 
 class QPulseAudioInput : public QAbstractAudioInput
 {
@@ -139,12 +139,12 @@ private:
     pa_sample_spec m_spec;
 };
 
-class InputPrivate : public QIODevice
+class PulseInputPrivate : public QIODevice
 {
     Q_OBJECT
 public:
-    InputPrivate(QPulseAudioInput *audio);
-    ~InputPrivate() {};
+    PulseInputPrivate(QPulseAudioInput *audio);
+    ~PulseInputPrivate() {};
 
     qint64 readData(char *data, qint64 len);
     qint64 writeData(const char *data, qint64 len);