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 | |
| 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')
| -rw-r--r-- | src/multimedia/qml/multimediadeclarative.cpp | 15 | ||||
| -rw-r--r-- | src/multimedia/qml/multimediadeclarative.h | 4 | ||||
| -rw-r--r-- | src/plugins/qdeclarativemodules/multimedia/multimedia.cpp | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp index be49915..cfb8999 100644 --- a/src/multimedia/qml/multimediadeclarative.cpp +++ b/src/multimedia/qml/multimediadeclarative.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include <QtMultimedia/multimediaqml.h> +#include <QtMultimedia/multimediadeclarative.h> #include <QtMultimedia/private/qsoundeffect_p.h> -#include <QtMultimedia/private/qmlaudio_p.h> -#include <QtMultimedia/private/qmlgraphicsvideo_p.h> +#include <QtMultimedia/private/qdeclarativeaudio_p.h> +#include <QtMultimedia/private/qdeclarativevideo_p.h> QT_BEGIN_NAMESPACE @@ -55,11 +55,14 @@ namespace QtMultimedia \internal */ -void qRegisterQmlElements() +void qRegisterDeclarativeElements(QDeclarativeEngine *engine, const char *uri) { + Q_UNUSED(engine) + Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia")); + qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect"); - qmlRegisterType<QmlAudio>("Qt.multimedia", 4, 7, "Audio", "Audio"); - qmlRegisterType<QmlGraphicsVideo>("Qt.multimedia", 4, 7, "Video", "Video"); + qmlRegisterType<QDeclarativeAudio>("Qt.multimedia", 4, 7, "Audio", "Audio"); + qmlRegisterType<QDeclarativeVideo>("Qt.multimedia", 4, 7, "Video", "Video"); } } diff --git a/src/multimedia/qml/multimediadeclarative.h b/src/multimedia/qml/multimediadeclarative.h index 41274c8..befddb6 100644 --- a/src/multimedia/qml/multimediadeclarative.h +++ b/src/multimedia/qml/multimediadeclarative.h @@ -49,9 +49,11 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +class QDeclarativeEngine; + namespace QtMultimedia { -extern void Q_MULTIMEDIA_EXPORT qRegisterQmlElements(); +extern void Q_MULTIMEDIA_EXPORT qRegisterDeclarativeElements(QDeclarativeEngine* engine, const char *uri); } QT_END_NAMESPACE 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); } }; |