diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 11:24:27 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-01 11:24:27 (GMT) |
| commit | 4cc9d165663728cb08b3269ea88a584410b79b70 (patch) | |
| tree | d1e1993be1d929a00478be0629d9fec910dd86ca /src/plugins/qdeclarativemodules/multimedia | |
| parent | 3a4dc08d08ce0388dd183a24923871e3e03ba531 (diff) | |
| parent | 049330b4a54836f227a0e179082527a5272e868d (diff) | |
| download | Qt-4cc9d165663728cb08b3269ea88a584410b79b70.zip Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.gz Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/plugins/qdeclarativemodules/multimedia')
| -rw-r--r-- | src/plugins/qdeclarativemodules/multimedia/multimedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp index e27dd8d..8becbf3 100644 --- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp +++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp @@ -49,9 +49,9 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin { Q_OBJECT public: - virtual void initialize(QDeclarativeEngine *engine, const char *uri) + virtual void registerTypes(const char *uri) { - QtMultimedia::qRegisterDeclarativeElements(engine, uri); + QtMultimedia::qRegisterDeclarativeElements(uri); } }; |