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/plugins | |
| parent | 5eb3c2fc8f90509cb368ab56f14364d6e17844f1 (diff) | |
| download | Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.zip Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.tar.gz Qt-3fb191bbeb0e8a2d49c5107df07c5457872357b3.tar.bz2 | |
Get rid of QmlModulePlugin.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmlmodules/multimedia/multimedia.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qmlmodules/multimedia/multimedia.cpp index d9414ee..0ebdfd9 100644 --- a/src/plugins/qmlmodules/multimedia/multimedia.cpp +++ b/src/plugins/qmlmodules/multimedia/multimedia.cpp @@ -39,27 +39,19 @@ ** ****************************************************************************/ -#include <QtDeclarative/qmlmoduleplugin.h> +#include <QtDeclarative/qmlextensionplugin.h> #include <QtDeclarative/qml.h> #include <QtMultimedia/qml.h> QT_BEGIN_NAMESPACE -class QMultimediaQmlModule : public QmlModulePlugin +class QMultimediaQmlModule : public QmlExtensionPlugin { Q_OBJECT public: - QStringList keys() const + virtual void initialize(QmlEngine *engine, const char *uri) { - return QStringList() << QLatin1String("Qt.multimedia"); - } - - void defineModule(const QString& uri) - { - Q_UNUSED(uri) - Q_ASSERT(uri == QLatin1String("Qt.multimedia")); - - QtMultimedia::qRegisterQmlElements(); + QtMultimedia::qRegisterQmlElements(engine, uri); } }; |