Remove QtMultimediaKit - all content has moved to QtMultimedia. master_201110271116
authorMichael Goddard <michael.goddard@nokia.com>
Thu, 27 Oct 2011 00:25:16 +0000 (10:25 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 27 Oct 2011 01:10:57 +0000 (03:10 +0200)
Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
.gitmodules
init-repository
qt.pro
qtmultimediakit [deleted submodule]

index c3f0a13..316745f 100644 (file)
@@ -55,9 +55,6 @@
 [submodule "qtsystems"]
        path = qtsystems
        url = git://gitorious.org/qt/qtsystems.git
-[submodule "qtmultimediakit"]
-       path = qtmultimediakit
-       url = git://gitorious.org/qt/qtmultimediakit.git
 [submodule "qtfeedback"]
        path = qtfeedback
        url = git://gitorious.org/qt/qtfeedback.git
index efd3cf5..9f40230 100755 (executable)
@@ -230,7 +230,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtfeedback
     qtlocation
     qtmultimedia
-    qtmultimediakit
     qtphonon
     qtpim
     qtqa
diff --git a/qt.pro b/qt.pro
index 1282c14..8d0550e 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -76,16 +76,10 @@ 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
 
 module_qtfeedback.subdir = $$IN_PWD/qtfeedback
 module_qtfeedback.target = module-qtfeedback
-module_qtfeedback.depends = module_qtbase module_qtmultimediakit module_qtdeclarative
+module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
 
 module_qtquick3d.subdir = $$IN_PWD/qtquick3d
 module_qtquick3d.target = module-qtquick3d
@@ -130,7 +124,6 @@ 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
 exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
diff --git a/qtmultimediakit b/qtmultimediakit
deleted file mode 160000 (submodule)
index fb10bcf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fb10bcf6cea520e1c43a77b6b88cf01ae9dc74ad