summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/mediacapture
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-02-15 14:52:31 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-02-28 07:13:18 +0000
commit1df2974e0c30c34cf3c458c9c89047fe9685b84d (patch)
treee310acb098ee2f6edadd6c4da8ab1a8c5f9c0926 /src/plugins/android/src/mediacapture
parent0354fdda8b430f7749082ca55ad6c1dc781f3918 (diff)
Replace deprecated qSort() by std::sort()
Change-Id: I74ffd5bafaef9ebbe7f12600ad831c8deb58ae64 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/android/src/mediacapture')
-rw-r--r--src/plugins/android/src/mediacapture/qandroidcapturesession.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
index a5aff51cd..bdc7ed403 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
@@ -46,6 +46,8 @@
#include "qandroidvideooutput.h"
#include "qandroidglobal.h"
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
QAndroidCaptureSession::QAndroidCaptureSession(QAndroidCameraSession *cameraSession)
@@ -495,8 +497,8 @@ void QAndroidCaptureSession::onCameraOpened()
}
}
- qSort(m_supportedResolutions.begin(), m_supportedResolutions.end(), qt_sizeLessThan);
- qSort(m_supportedFramerates.begin(), m_supportedFramerates.end());
+ std::sort(m_supportedResolutions.begin(), m_supportedResolutions.end(), qt_sizeLessThan);
+ std::sort(m_supportedFramerates.begin(), m_supportedFramerates.end());
applySettings();
}