diff options
author | Gabriel Hege <g+qt@hege.cc> | 2014-12-22 13:17:42 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-12-22 15:48:42 +0100 |
commit | 68dbc9ba02475f569905b8b7b37c6a2a2961e030 (patch) | |
tree | b751a07becaf3b3b83932ac311f4dd5bebfd48e2 /src/plugins/pulseaudio/qaudiooutput_pulse.h | |
parent | 61fd6498614215bef59162c20b44c57da315e000 (diff) |
Fix: static linking on Linux with both PulseAudio and Alsa plugins
Fixed multiply defined symbols when linking statically with both
PulseAudio and Alsa plugins enabled:
The private classes In/OutputPrivate had identical names and have been
renamed.
Change-Id: I9415beeeed9fb0e14ead3f0ab906f343b3934341
Task-number: QTBUG-43514
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/pulseaudio/qaudiooutput_pulse.h')
-rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.h b/src/plugins/pulseaudio/qaudiooutput_pulse.h index a8e263458..c8367a964 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.h +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QPulseAudioOutput : public QAbstractAudioOutput { - friend class OutputPrivate; + friend class PulseOutputPrivate; Q_OBJECT public: @@ -139,14 +139,14 @@ private: pa_sample_spec m_spec; }; -class OutputPrivate : public QIODevice +class PulseOutputPrivate : public QIODevice { friend class QPulseAudioOutput; Q_OBJECT public: - OutputPrivate(QPulseAudioOutput *audio); - virtual ~OutputPrivate() {} + PulseOutputPrivate(QPulseAudioOutput *audio); + virtual ~PulseOutputPrivate() {} protected: qint64 readData(char *data, qint64 len); |