diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 00:27:16 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 00:27:16 (GMT) |
| commit | 8a6ac436b00de84501dba5968f960dd3f4561dd3 (patch) | |
| tree | 8efd6d7ffe0053cf38b909d2f531c4fb9658de21 /src/plugins | |
| parent | 0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4 (diff) | |
| download | Qt-8a6ac436b00de84501dba5968f960dd3f4561dd3.zip Qt-8a6ac436b00de84501dba5968f960dd3f4561dd3.tar.gz Qt-8a6ac436b00de84501dba5968f960dd3f4561dd3.tar.bz2 | |
Change Multimedia declarative module in line with recent commits.
Diffstat (limited to 'src/plugins')
| -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 1158c88..e27dd8d 100644 --- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp +++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include <QtDeclarative/qdeclarativeextensionplugin.h> #include <QtDeclarative/qdeclarative.h> -#include <QtMultimedia/qdeclarative.h> +#include <QtMultimedia/multimediadeclarative.h> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin public: virtual void initialize(QDeclarativeEngine *engine, const char *uri) { - QtMultimedia::qRegisterQmlElements(engine, uri); + QtMultimedia::qRegisterDeclarativeElements(engine, uri); } }; |