diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-11 10:35:45 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-08 10:11:08 +0200 |
commit | 9178132f75563cd0e907525f08736c1b4cec73b4 (patch) | |
tree | 4176f8cedd3dc667ae8ee563026191eac43ecdc2 /tests/auto/integration | |
parent | 5e35587975d6917c9d60ee06c40211af98020105 (diff) |
Remove usages of deprecated APIs
- Replace the usages of deprecated APIs by corresponding
alternatives.
- Made the tests for deprecated APIs to compile conditionally,
based on the deprecation version.
Task-number: QTBUG-76491
Task-number: QTBUG-76540
Task-number: QTBUG-76541
Change-Id: Ifd397dae9b3ebc2ba2504db7baa2d8ff21bfb3a7
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'tests/auto/integration')
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index b0497be2f..ccd68aeec 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -68,8 +68,10 @@ public slots: void cleanupTestCase(); private slots: +#if QT_DEPRECATED_SINCE(5, 3) void testAvailableDevices(); void testDeviceDescription(); +#endif void testCameraInfo(); void testCtorWithDevice(); void testCtorWithCameraInfo(); @@ -100,6 +102,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(); @@ -118,6 +121,7 @@ void tst_QCameraBackend::testDeviceDescription() QVERIFY(QCamera::deviceDescription(device).length() > 0); } } +#endif void tst_QCameraBackend::testCameraInfo() { @@ -138,10 +142,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; @@ -625,11 +630,11 @@ void tst_QCameraBackend::testVideoRecording_data() { QTest::addColumn<QByteArray>("device"); - const QList<QByteArray> devices = QCamera::availableDevices(); + const auto devices = QCameraInfo::availableCameras(); - for (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()) |