diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-25 10:53:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:41 +0200 |
| commit | b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch) | |
| tree | d647951ecb69c9b39f004198d76fbc4972174549 /tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp | |
| parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) | |
Rename availabilityError to availability.
It's perhaps clearer in the usual case.
Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp')
| -rw-r--r-- | tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index f93154551..6f1207300 100644 --- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -312,7 +312,7 @@ void tst_QCameraImageCapture::errors() imageCapture1.capture(QString::fromLatin1("/dev/null")); QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError); QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture"); - QVERIFY(imageCapture1.availabilityError() == QtMultimedia::ServiceMissingError); + QVERIFY(imageCapture1.availability() == QtMultimedia::ServiceMissing); provider->service = mockcameraservice; @@ -321,12 +321,12 @@ void tst_QCameraImageCapture::errors() QVERIFY(imageCapture.isAvailable() == true); QVERIFY(imageCapture.error() == QCameraImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); - QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError); + QVERIFY(imageCapture.availability() == QtMultimedia::Available); imageCapture.capture(); QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError); QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state"); - QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError); + QVERIFY(imageCapture.availability() == QtMultimedia::Available); } //MaemoAPI-1831:test error |