diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2011-08-25 16:18:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 09:18:16 +0200 |
| commit | 5d71ee6abf9f3ab4ba88d929b61038f4f994125f (patch) | |
| tree | d28039398bb6bb48eff095e443ed72c00bcb88d9 /tests/auto | |
| parent | da9b436cd1be60da495f55fc4f4236136e7851f8 (diff) | |
Dropped Incandescent white balance mode.
It's the same as Tungsten, was inittialy added by mistake.
Change-Id: Idf1d7be2f8d0969bba3480a8702034b7cabfdaef
Reviewed-on: http://codereview.qt.nokia.com/3563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qcamera/tst_qcamera.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp index 9234998dd..016e738a0 100644 --- a/tests/auto/qcamera/tst_qcamera.cpp +++ b/tests/auto/qcamera/tst_qcamera.cpp @@ -556,7 +556,7 @@ void tst_QCamera::testCameraWhiteBalance() QSet<QCameraImageProcessing::WhiteBalanceMode> whiteBalanceModes; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceAuto; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash; - whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent; + whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten; MockCameraService service; service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash); @@ -574,11 +574,11 @@ void tst_QCamera::testCameraWhiteBalance() QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceFlash); QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceAuto)); QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash)); - QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceIncandescent)); + QVERIFY(camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceTungsten)); QVERIFY(!camera.imageProcessing()->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceCloudy)); - cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceIncandescent); - QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceIncandescent); + cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceTungsten); + QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceTungsten); cameraImageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceManual); QCOMPARE(cameraImageProcessing->whiteBalanceMode(), QCameraImageProcessing::WhiteBalanceManual); @@ -1747,7 +1747,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing() whiteBalanceModes << QCameraImageProcessing::WhiteBalanceShade; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceTungsten; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFluorescent; - whiteBalanceModes << QCameraImageProcessing::WhiteBalanceIncandescent; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceFlash; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceSunset; whiteBalanceModes << QCameraImageProcessing::WhiteBalanceVendor; @@ -1783,10 +1782,6 @@ void tst_QCamera::testEnumOfQCameraImageProcessing() QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFluorescent)); QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFluorescent); - service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceIncandescent); - QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceIncandescent)); - QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceIncandescent); - service.mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash); QVERIFY(service.mockImageProcessingControl->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceFlash)); QVERIFY(service.mockImageProcessingControl->whiteBalanceMode() == QCameraImageProcessing::WhiteBalanceFlash); |