1 files changed, 15 insertions, 9 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 80e2e693c..894486230 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -69,8 +69,10 @@ public slots:
     void cleanupTestCase();
 
 private slots:
+#if QT_DEPRECATED_SINCE(5, 3)
     void testAvailableDevices();
     void testDeviceDescription();
+#endif
     void testCameraInfo();
     void testCtorWithDevice();
     void testCtorWithCameraInfo();
@@ -101,6 +103,7 @@ void tst_QCameraBackend::cleanupTestCase()
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 3)
 void tst_QCameraBackend::testAvailableDevices()
 {
     int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count();
@@ -114,22 +117,24 @@ void tst_QCameraBackend::testDeviceDescription()
     if (deviceCount == 0)
         QVERIFY(QCamera::deviceDescription(QByteArray("random")).isNull());
     else {
-        foreach (const QByteArray &device, QCamera::availableDevices())
+        const auto devices = QCamera::availableDevices();
+        for (const QByteArray &device : devices)
             QVERIFY(QCamera::deviceDescription(device).length() > 0);
     }
 }
+#endif
 
 void tst_QCameraBackend::testCameraInfo()
 {
     int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count();
-    QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
+    const QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
     QCOMPARE(cameras.count(), deviceCount);
     if (cameras.isEmpty()) {
         QVERIFY(QCameraInfo::defaultCamera().isNull());
         QSKIP("Camera selection is not supported");
     }
 
-    foreach (const QCameraInfo &info, cameras) {
+    for (const QCameraInfo &info : cameras) {
         QVERIFY(!info.deviceName().isEmpty());
         QVERIFY(!info.description().isEmpty());
         QVERIFY(info.orientation() % 90 == 0);
@@ -138,10 +143,11 @@ void tst_QCameraBackend::testCameraInfo()
 
 void tst_QCameraBackend::testCtorWithDevice()
 {
-    if (QCamera::availableDevices().isEmpty())
+    const auto availableCameras = QCameraInfo::availableCameras();
+    if (availableCameras.isEmpty())
         QSKIP("Camera selection not supported");
 
-    QCamera *camera = new QCamera(QCamera::availableDevices().first());
+    QCamera *camera = new QCamera(availableCameras.first().deviceName().toLatin1());
     QCOMPARE(camera->error(), QCamera::NoError);
     delete camera;
 
@@ -607,11 +613,11 @@ void tst_QCameraBackend::testVideoRecording_data()
 {
     QTest::addColumn<QByteArray>("device");
 
-    QList<QByteArray> devices = QCamera::availableDevices();
+    const auto devices = QCameraInfo::availableCameras();
 
-    foreach (const QByteArray &device, devices) {
-        QTest::newRow(QCamera::deviceDescription(device).toUtf8())
-                << device;
+    for (const auto &device : devices) {
+        QTest::newRow(device.description().toUtf8())
+                << device.deviceName().toLatin1();
     }
 
     if (devices.isEmpty())