diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-05-31 20:52:51 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-06-04 10:23:10 +0200 |
| commit | 99cf6a4aed9c48287c46b05cdb4507c0637dd2e1 (patch) | |
| tree | 571bb8bc0f70d25e7c20a603e87df9dc5f8b1953 /tests | |
| parent | 9c16be3d9d956f612dda431f4883eab3b09a8b67 (diff) | |
Remove QT_DEPRECATED API
Change-Id: I2aa2334f7408164bf288d82b28e4e6aff9a2503b
Fixes: QTBUG-84593
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 068b30653..c49236f43 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -68,10 +68,6 @@ public slots: void cleanupTestCase(); private slots: -#if QT_DEPRECATED_SINCE(5, 3) - void testAvailableDevices(); - void testDeviceDescription(); -#endif void testCameraInfo(); void testCtorWithDevice(); void testCtorWithCameraInfo(); @@ -102,27 +98,6 @@ void tst_QCameraBackend::cleanupTestCase() { } -#if QT_DEPRECATED_SINCE(5, 3) -void tst_QCameraBackend::testAvailableDevices() -{ - int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - QCOMPARE(QCamera::availableDevices().count(), deviceCount); -} - -void tst_QCameraBackend::testDeviceDescription() -{ - int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - - if (deviceCount == 0) - QVERIFY(QCamera::deviceDescription(QByteArray("random")).isNull()); - else { - 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(); |