diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 07:27:36 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 07:27:36 (GMT) |
| commit | bd7ef8002b008816f5233fdd40742a12e0861b82 (patch) | |
| tree | c4b8cabdc88e2139825cbb44636d995614c41e5d /src/plugins | |
| parent | c8823023db4a280f3d12c983451a05f8da3780dd (diff) | |
| download | Qt-bd7ef8002b008816f5233fdd40742a12e0861b82.zip Qt-bd7ef8002b008816f5233fdd40742a12e0861b82.tar.gz Qt-bd7ef8002b008816f5233fdd40742a12e0861b82.tar.bz2 | |
Fix up some rename confusion.
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); } }; |