Re-add qtmultimedia. master_201110261710
authorMichael Goddard <michael.goddard@nokia.com>
Wed, 26 Oct 2011 06:40:48 +0000 (16:40 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 26 Oct 2011 07:06:00 +0000 (09:06 +0200)
The contents of QtMultimediaKit are being placed in QtMultimedia.
After this commit integrates, any dependent modules can be updated,
and then another change to remove QtMMK from Qt5 can be done.

Change-Id: I466df08ef1e764fae9056a61a51b82cab8633244
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
init-repository
qt.pro
qtmultimedia [new submodule]

index dd15d5a..3a2ed35 100755 (executable)
@@ -229,6 +229,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtdocgallery
     qtfeedback
     qtlocation
+    qtmultimedia
     qtmultimediakit
     qtphonon
     qtpim
diff --git a/qt.pro b/qt.pro
index 42f609c..1282c14 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -73,6 +73,12 @@ module_qtsystems.subdir = $$IN_PWD/qtsystems
 module_qtsystems.target = module-qtsystems
 module_qtsystems.depends = module_qtbase module_qtdeclarative
 
+module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
+module_qtmultimedia.target = module-qtmultimedia
+module_qtmultimedia.depends = module_qtbase module_qtdeclarative
+# Have this turned off to start with so qt5 integrates
+module_qtmultimedia.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
@@ -123,6 +129,7 @@ exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
 exists(qtactiveqt/qtactiveqt.pro): SUBDIRS += module_qtactiveqt
 exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
 exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
+exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
 exists(qtmultimediakit/qtmultimediakit.pro): SUBDIRS += module_qtmultimediakit
 exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
 exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
diff --git a/qtmultimedia b/qtmultimedia
new file mode 160000 (submodule)
index 0000000..b9fd2c6
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit b9fd2c65e1f5a66b520687a881c66919300a5230