diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-27 10:25:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 03:10:57 +0200 |
| commit | 52ba0cb05495d7d7514791b6e9654869f8902ea1 (patch) | |
| tree | 9feff60873163177d0789b9064da01bde5b9b2a4 | |
| parent | b86353b417e305b6acab4a670744c3309c948da4 (diff) | |
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>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 9 | ||||
| m--------- | qtmultimediakit | 0 |
4 files changed, 1 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index c3f0a130..316745f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/init-repository b/init-repository index efd3cf55..9f402305 100755 --- a/init-repository +++ b/init-repository @@ -230,7 +230,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtfeedback qtlocation qtmultimedia - qtmultimediakit qtphonon qtpim qtqa @@ -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 -Subproject fb10bcf6cea520e1c43a77b6b88cf01ae9dc74a |