diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 08:46:34 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-23 13:47:21 (GMT) |
| commit | 3fb191bbeb0e8a2d49c5107df07c5457872357b3 (patch) | |
| tree | 44e5f820242d40d2c1f80a8f2608b2ab6fbb8d08 /src/multimedia | |
| parent | 5eb3c2fc8f90509cb368ab56f14364d6e17844f1 (diff) | |
| download | Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.zip Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.tar.gz Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.tar.bz2 | |
Get rid of QmlModulePlugin.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qml/qml.cpp | 10 | ||||
| -rw-r--r-- | src/multimedia/qml/qml.h | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/multimedia/qml/qml.cpp b/src/multimedia/qml/qml.cpp index b9ee212..43a32c5 100644 --- a/src/multimedia/qml/qml.cpp +++ b/src/multimedia/qml/qml.cpp @@ -55,11 +55,13 @@ namespace QtMultimedia \internal */ -void qRegisterQmlElements() +void qRegisterQmlElements(QmlEngine *engine, const char *uri) { - qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect"); - qmlRegisterType<QmlAudio>("Qt.multimedia", 4, 7, "Audio", "Audio"); - qmlRegisterType<QmlGraphicsVideo>("Qt.multimedia", 4, 7, "Video", "Video"); + Q_UNUSED(engine); + + qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect", "SoundEffect"); + qmlRegisterType<QmlAudio>(uri, 4, 7, "Audio", "Audio"); + qmlRegisterType<QmlGraphicsVideo>(uri, 4, 7, "Video", "Video"); } } diff --git a/src/multimedia/qml/qml.h b/src/multimedia/qml/qml.h index 41274c8..c4159b3 100644 --- a/src/multimedia/qml/qml.h +++ b/src/multimedia/qml/qml.h @@ -47,11 +47,13 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +class QmlEngine; + QT_MODULE(Multimedia) namespace QtMultimedia { -extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(); +extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(QmlEngine *engine, const char *uri); } QT_END_NAMESPACE |