diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-25 12:57:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 06:15:06 +0200 |
| commit | 89b6bcbd9687d7df711d42583413ec01f73ee047 (patch) | |
| tree | aa65602ceefc1aa6dc5379386eff07e83a942115 | |
| parent | 711f49efea11e0ef0a741b851ba080bc941fcf1a (diff) | |
| download | qtmultimedia-89b6bcbd9687d7df711d42583413ec01f73ee047.tar.gz | |
Declare these metatypes.
Change-Id: I5b10669f2b17f67d95469dc28e99822d7f08280c
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
| -rw-r--r-- | src/multimedia/qtmedianamespace.h | 6 | ||||
| -rw-r--r-- | tests/auto/qcamera/tst_qcamera.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qcamerabackend/tst_qcamerabackend.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qtmedianamespace.h index 4296b188d..34a1a9ff4 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qtmedianamespace.h @@ -333,6 +333,12 @@ namespace QtMultimediaKit QT_END_NAMESPACE +Q_DECLARE_METATYPE(QtMultimedia::AvailabilityError) +Q_DECLARE_METATYPE(QtMultimedia::SupportEstimate) +Q_DECLARE_METATYPE(QtMultimedia::MetaData) +Q_DECLARE_METATYPE(QtMultimedia::EncodingMode) +Q_DECLARE_METATYPE(QtMultimedia::EncodingQuality) + QT_END_HEADER diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp index c9093e239..de44ae0d8 100644 --- a/tests/auto/qcamera/tst_qcamera.cpp +++ b/tests/auto/qcamera/tst_qcamera.cpp @@ -69,7 +69,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QtMultimedia::MetaData) class tst_QCamera: public QObject { diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp index a6399f5c6..eabf7031f 100644 --- a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/qcamerabackend/tst_qcamerabackend.cpp @@ -121,7 +121,6 @@ QT_USE_NAMESPACE */ -Q_DECLARE_METATYPE(QtMultimedia::MetaData) Q_DECLARE_METATYPE(QVideoFrame) class tst_QCameraBackend: public QObject diff --git a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp index dc29b949d..92cafda6e 100644 --- a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp @@ -72,7 +72,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QtMultimedia::MetaData) class tst_QCameraWidgets: public QObject { diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 32d869a90..ef538b665 100644 --- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -82,7 +82,6 @@ private slots: void loops(); }; -Q_DECLARE_METATYPE(QtMultimedia::MetaData); Q_DECLARE_METATYPE(QDeclarativeAudio::Error); class QtTestMediaPlayerControl : public QMediaPlayerControl diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp index 750cd9320..5a0dce318 100644 --- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp @@ -78,7 +78,6 @@ private slots: void geometry(); }; -Q_DECLARE_METATYPE(QtMultimedia::MetaData); Q_DECLARE_METATYPE(QDeclarativeVideo::Error); class QtTestMediaPlayerControl : public QMediaPlayerControl |