Remove QtMultimediaKit - all content has moved to QtMultimedia.

Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-27 10:25:16 +10:00
committed by Qt by Nokia
parent b86353b417
commit 52ba0cb054
4 changed files with 1 additions and 13 deletions

3
.gitmodules vendored
View 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

View File

@@ -230,7 +230,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtfeedback
qtlocation
qtmultimedia
qtmultimediakit
qtphonon
qtpim
qtqa

9
qt.pro
View File

@@ -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

Submodule qtmultimediakit deleted from fb10bcf6ce