diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 06:23:26 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 06:23:26 (GMT) |
| commit | 6fa813a4d5b46523940f6af8ed74e6855bad49c9 (patch) | |
| tree | a9213f6f52c31c218166fd946012cac50de84caa /src/multimedia | |
| parent | 8c38a945eaa2c13af4bfc812e80bbccfb2243e5f (diff) | |
| download | Qt-6fa813a4d5b46523940f6af8ed74e6855bad49c9.zip Qt-6fa813a4d5b46523940f6af8ed74e6855bad49c9.tar.gz Qt-6fa813a4d5b46523940f6af8ed74e6855bad49c9.tar.bz2 | |
Use the qmlmodule method for adding multimedia qml elements.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qml/qmlaudio.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/qml/qmlaudio_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/qml/qmlgraphicsvideo.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/qml/qmlgraphicsvideo_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/qml/qsoundeffect.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/qml/qsoundeffect_p.h | 2 |
6 files changed, 3 insertions, 7 deletions
diff --git a/src/multimedia/qml/qmlaudio.cpp b/src/multimedia/qml/qmlaudio.cpp index fc340d0..5719050 100644 --- a/src/multimedia/qml/qmlaudio.cpp +++ b/src/multimedia/qml/qmlaudio.cpp @@ -45,7 +45,6 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(Qt,4,6,Audio,QmlAudio); /*! \qmlclass Audio QmlAudio diff --git a/src/multimedia/qml/qmlaudio_p.h b/src/multimedia/qml/qmlaudio_p.h index f034518..f6c5cbf 100644 --- a/src/multimedia/qml/qmlaudio_p.h +++ b/src/multimedia/qml/qmlaudio_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QTimerEvent; -class Q_AUTOTEST_EXPORT QmlAudio : public QObject, public QmlMediaBase, public QmlParserStatus +class Q_MULTIMEDIA_EXPORT QmlAudio : public QObject, public QmlMediaBase, public QmlParserStatus { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/multimedia/qml/qmlgraphicsvideo.cpp b/src/multimedia/qml/qmlgraphicsvideo.cpp index 236387e..1dd1f8b 100644 --- a/src/multimedia/qml/qmlgraphicsvideo.cpp +++ b/src/multimedia/qml/qmlgraphicsvideo.cpp @@ -50,8 +50,6 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(Qt,4,6,Video,QmlGraphicsVideo); - void QmlGraphicsVideo::_q_nativeSizeChanged(const QSizeF &size) { diff --git a/src/multimedia/qml/qmlgraphicsvideo_p.h b/src/multimedia/qml/qmlgraphicsvideo_p.h index a4f8e32..bd15b7f 100644 --- a/src/multimedia/qml/qmlgraphicsvideo_p.h +++ b/src/multimedia/qml/qmlgraphicsvideo_p.h @@ -58,7 +58,7 @@ class QTimerEvent; class QVideoSurfaceFormat; -class Q_AUTOTEST_EXPORT QmlGraphicsVideo : public QmlGraphicsItem, public QmlMediaBase +class Q_MULTIMEDIA_EXPORT QmlGraphicsVideo : public QmlGraphicsItem, public QmlMediaBase { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp index b9174b7..1a67414 100644 --- a/src/multimedia/qml/qsoundeffect.cpp +++ b/src/multimedia/qml/qsoundeffect.cpp @@ -52,7 +52,6 @@ #include "qsoundeffect_qsound_p.h" #endif -QML_DEFINE_TYPE(Qt,4,6,SoundEffect,QSoundEffect) /*! \qmlclass QSoundEffect diff --git a/src/multimedia/qml/qsoundeffect_p.h b/src/multimedia/qml/qsoundeffect_p.h index 6d5790d..2610a69 100644 --- a/src/multimedia/qml/qsoundeffect_p.h +++ b/src/multimedia/qml/qsoundeffect_p.h @@ -64,7 +64,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSoundEffectPrivate; -class QSoundEffect : public QObject +class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) |