Add the QtMultimediaKit module. Currently not built.
authorMichael Goddard <michael.goddard@nokia.com>
Wed, 29 Jun 2011 05:16:16 +0000 (15:16 +1000)
committerMichael Goddard <michael.goddard@nokia.com>
Wed, 29 Jun 2011 06:32:18 +0000 (16:32 +1000)
Reviewed-by: Rohan McGovern
.gitmodules
init-repository
qt.pro
qtmultimediakit [new submodule]

index 9d8d4ca..5e21a13 100644 (file)
@@ -55,3 +55,6 @@
 [submodule "qtsystems"]
        path = qtsystems
        url = git://gitorious.org/qt/qtsystems.git
 [submodule "qtsystems"]
        path = qtsystems
        url = git://gitorious.org/qt/qtsystems.git
+[submodule "qtmultimediakit"]
+       path = qtmultimediakit
+       url = git://gitorious.org/qt/qtmultimediakit.git
index 4de7d7e..26f92a9 100755 (executable)
@@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "codereview.qt.nokia.com:qt/$_.git" } qw(
     qtbase
     qtdeclarative
     qtdoc
     qtbase
     qtdeclarative
     qtdoc
+    qtmultimediakit
 );
 
 my $BNE_MIRROR_URL_BASE
 );
 
 my $BNE_MIRROR_URL_BASE
diff --git a/qt.pro b/qt.pro
index 4337856..754bbec 100644 (file)
--- 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
 
 # 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 \
 SUBDIRS       = \
                 module_qtbase \
                 module_qtsvg \
@@ -96,6 +102,7 @@ SUBDIRS       = \
                 module_qtactiveqt \
                 module_qtsensors \
                 module_qtsystems \
                 module_qtactiveqt \
                 module_qtsensors \
                 module_qtsystems \
+                module_qtmultimediakit \
 
 exists(qtwebkit/Tools/Scripts/build-webkit) {
     SUBDIRS +=  module_qtwebkit \
 
 exists(qtwebkit/Tools/Scripts/build-webkit) {
     SUBDIRS +=  module_qtwebkit \
diff --git a/qtmultimediakit b/qtmultimediakit
new file mode 160000 (submodule)
index 0000000..242d0e4
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 242d0e49b8e84e638c0b1714fce1b71bf588efe6