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

Change-Id: I840b63f6d6fc8ff974d256e26732bf54937256cc

1 files changed, 4 insertions, 2 deletions

diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 49df1c028..d188259dc 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -569,15 +569,17 @@ bool Engine::selectFormat()
             sampleRatesList += m_audioInputDevice.supportedSampleRates();
 
         sampleRatesList += m_audioOutputDevice.supportedSampleRates();
-        sampleRatesList = QSet<int>(sampleRatesList.begin(), sampleRatesList.end()).values(); // remove duplicates
         std::sort(sampleRatesList.begin(), sampleRatesList.end());
+        const auto uniqueRatesEnd = std::unique(sampleRatesList.begin(), sampleRatesList.end());
+        sampleRatesList.erase(uniqueRatesEnd, sampleRatesList.end());
         ENGINE_DEBUG << "Engine::initialize frequenciesList" << sampleRatesList;
 
         QList<int> channelsList;
         channelsList += m_audioInputDevice.supportedChannelCounts();
         channelsList += m_audioOutputDevice.supportedChannelCounts();
-        channelsList = QSet<int>(channelsList.begin(), channelsList.end()).values();
         std::sort(channelsList.begin(), channelsList.end());
+        const auto uniqueChannelsEnd = std::unique(channelsList.begin(), channelsList.end());
+        channelsList.erase(uniqueChannelsEnd, channelsList.end());
         ENGINE_DEBUG << "Engine::initialize channelsList" << channelsList;
 
         QAudioFormat format;