Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add the QtMultimediaKit module.  Currently not built.

4 files changed, 11 insertions, 0 deletions

diff --git a/.gitmodules b/.gitmodules
index 9d8d4ca5..5e21a131 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "qtsystems"]
 	path = qtsystems
 	url = git://gitorious.org/qt/qtsystems.git
+[submodule "qtmultimediakit"]
+	path = qtmultimediakit
+	url = git://gitorious.org/qt/qtmultimediakit.git
diff --git a/init-repository b/init-repository
index 4de7d7ea..26f92a98 100755
--- a/init-repository
+++ b/init-repository
@@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "codereview.qt.nokia.com:qt/$_.git" } qw(
     qtbase
     qtdeclarative
     qtdoc
+    qtmultimediakit
 );
 
 my $BNE_MIRROR_URL_BASE
diff --git a/qt.pro b/qt.pro
index 4337856e..754bbec4 100644
--- a/qt.pro
+++ b/qt.pro
@@ -79,6 +79,12 @@ module_qtsystems.depends = module_qtbase module_qtdeclarative
 # not yet enabled by default
 module_qtsystems.CONFIG = no_default_target no_default_install
 
+module_qtmultimediakit.subdir = $$IN_PWD/qtmultimediakit
+module_qtmultimediakit.target = module-qtmultimediakit
+module_qtmultimediakit.depends = module_qtbase module_qtdeclarative
+# not yet enabled by default
+module_qtmultimediakit.CONFIG = no_default_target no_default_install
+
 SUBDIRS       = \
                 module_qtbase \
                 module_qtsvg \
@@ -96,6 +102,7 @@ SUBDIRS       = \
                 module_qtactiveqt \
                 module_qtsensors \
                 module_qtsystems \
+                module_qtmultimediakit \
 
 exists(qtwebkit/Tools/Scripts/build-webkit) {
     SUBDIRS +=  module_qtwebkit \
diff --git a/qtmultimediakit b/qtmultimediakit
new file mode 160000
+Subproject 242d0e49b8e84e638c0b1714fce1b71bf588efe