diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-16 16:40:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 06:30:37 +0100 |
| commit | 8ff5b88b27b83438bfe576eea824a4a4d47249ce (patch) | |
| tree | 1ccb1b0114ec8371ac44a0ab68535c50f8e4e604 /tests/auto/integration/qcamerabackend | |
| parent | 382ba7d4f4c1ca91d59d04faf35a3d75d6430df5 (diff) | |
Changed metadata keys type from enum to QString.
This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.
Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/integration/qcamerabackend')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 64d8b2221..7a4981ef2 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -127,8 +127,6 @@ private: void tst_QCameraBackend::initTestCase() { - qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData"); - QCamera camera; if (!camera.isAvailable()) QSKIP("Camera is not available"); @@ -501,7 +499,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata() QCameraImageCapture imageCapture(&camera); camera.exposure()->setFlashMode(QCameraExposure::FlashOff); - QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant))); + QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QString,QVariant))); QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString))); camera.start(); |