diff options
author | Doris Verria <doris.verria@qt.io> | 2021-05-25 15:28:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-26 05:57:55 +0000 |
commit | 80692b9476be22b7e1a82e4d90b54c939d81a24b (patch) | |
tree | 97ffe609690727451383628ffe23c2f809668797 | |
parent | ef2d075b357464d3d6ae1c963b1a419bd3121241 (diff) |
Some smaller test fixes
Change-Id: If35ad376f2ca96e740117c71d0e5cc950da9302c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 2 | ||||
-rw-r--r-- | tests/auto/integration/qquickvideooutput_window/tst_qquickvideooutput_window.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 5e27ab1fd..d273b0ed1 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -420,7 +420,7 @@ void tst_QCameraBackend::testExposureMode() camera.setExposureMode(QCamera::ExposureManual); QCOMPARE(camera.exposureMode(), QCamera::ExposureManual); camera.start(); - QTRY_COMPARE(camera.status(), QCamera::ActiveStatus); + QVERIFY(camera.isActive()); QCOMPARE(camera.exposureMode(), QCamera::ExposureManual); camera.setManualExposureTime(.02); // ~20ms should be supported by most cameras diff --git a/tests/auto/integration/qquickvideooutput_window/tst_qquickvideooutput_window.cpp b/tests/auto/integration/qquickvideooutput_window/tst_qquickvideooutput_window.cpp index ec824a61e..518116cc1 100644 --- a/tests/auto/integration/qquickvideooutput_window/tst_qquickvideooutput_window.cpp +++ b/tests/auto/integration/qquickvideooutput_window/tst_qquickvideooutput_window.cpp @@ -86,6 +86,7 @@ void tst_QQuickVideoOutputWindow::initTestCase() component.loadUrl(QUrl("qrc:/main.qml")); m_rootItem.reset(qobject_cast<QQuickItem *>(component.create())); + QVERIFY(m_rootItem != nullptr); m_videoItem = qobject_cast<QQuickVideoOutput *>(m_rootItem->findChild<QQuickItem *>("videoOutput")); QVERIFY(m_videoItem); m_sink = m_videoItem->videoSink(); |