diff options
| -rw-r--r-- | examples/multimedia/spectrum/app/engine.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidcamera.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index 7e11d012b..a60904e5e 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -570,14 +570,14 @@ bool Engine::selectFormat() sampleRatesList += m_audioOutputDevice.supportedSampleRates(); sampleRatesList = sampleRatesList.toSet().toList(); // remove duplicates - qSort(sampleRatesList); + std::sort(sampleRatesList.begin(), sampleRatesList.end()); ENGINE_DEBUG << "Engine::initialize frequenciesList" << sampleRatesList; QList<int> channelsList; channelsList += m_audioInputDevice.supportedChannelCounts(); channelsList += m_audioOutputDevice.supportedChannelCounts(); channelsList = channelsList.toSet().toList(); - qSort(channelsList); + std::sort(channelsList.begin(), channelsList.end()); ENGINE_DEBUG << "Engine::initialize channelsList" << channelsList; QAudioFormat format; diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 90af0119a..a92a3373a 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -942,7 +942,7 @@ QList<QSize> AndroidCameraPrivate::getSupportedPreviewSizes() list.append(QSize(size.getField<jint>("width"), size.getField<jint>("height"))); } - qSort(list.begin(), list.end(), qt_sizeLessThan); + std::sort(list.begin(), list.end(), qt_sizeLessThan); } return list; @@ -1541,7 +1541,7 @@ QList<QSize> AndroidCameraPrivate::getSupportedPictureSizes() list.append(QSize(size.getField<jint>("width"), size.getField<jint>("height"))); } - qSort(list.begin(), list.end(), qt_sizeLessThan); + std::sort(list.begin(), list.end(), qt_sizeLessThan); } return list; |