summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/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/gstreamer/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/gstreamer/mediacapture')
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
index 9139f1fe2..ef0832f7e 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
@@ -45,6 +45,8 @@
#include <private/qcore_unix_p.h>
#include <linux/videodev2.h>
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); }
@@ -252,10 +254,10 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device)
m_frameRates.append(rate/1000.0);
}
- qSort(m_frameRates);
+ std::sort(m_frameRates.begin(), m_frameRates.end());
m_resolutions = allResolutions.toList();
- qSort(m_resolutions);
+ std::sort(m_resolutions.begin(), m_resolutions.end());
//qDebug() << "frame rates:" << m_frameRates;
//qDebug() << "resolutions:" << m_resolutions;