Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	src/src.pro

2 files changed, 26 insertions, 5 deletions

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 8becbf3..a2e74f4 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -41,17 +41,27 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/private/qsoundeffect_p.h>
+
+#include "qdeclarativevideo_p.h"
+#include "qdeclarativeaudio_p.h"
+
+
+QML_DECLARE_TYPE(QSoundEffect)
 
 QT_BEGIN_NAMESPACE
 
-class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
+class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
     virtual void registerTypes(const char *uri)
     {
-        QtMultimedia::qRegisterDeclarativeElements(uri);
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
+
+        qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect");
+        qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio");
+        qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video");
     }
 };
 
@@ -59,5 +69,5 @@ QT_END_NAMESPACE
 
 #include "multimedia.moc"
 
-Q_EXPORT_PLUGIN2(qmultimediaqmlmodule, QT_PREPEND_NAMESPACE(QMultimediaQmlModule));
+Q_EXPORT_PLUGIN2(qmultimediadeclarativemodule, QT_PREPEND_NAMESPACE(QMultimediaDeclarativeModule));
 
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index ad2ce1b..117aa9b 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -4,7 +4,18 @@ include(../qimportbase.pri)
 
 QT += multimedia declarative
 
-SOURCES += multimedia.cpp
+HEADERS += \
+        qdeclarativeaudio_p.h \
+        qdeclarativemediabase_p.h \
+        qdeclarativevideo_p.h \
+        qmetadatacontrolmetaobject_p.h \
+
+SOURCES += \
+        multimedia.cpp \
+        qdeclarativeaudio.cpp \
+        qdeclarativemediabase.cpp \
+        qdeclarativevideo.cpp \
+        qmetadatacontrolmetaobject.cpp
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia
 target.path = $$TARGETPATH