diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-08-26 09:56:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-02 05:21:55 +0200 |
| commit | 1b5490797bff404b3da0b2e86aee5d4c0e011721 (patch) | |
| tree | 621eb927ff43d9b237fba651a1b7530e6f15d3b5 | |
| parent | 757562f7bdbc144035d16c240814f836f1e50d27 (diff) | |
Remove QtMultimedia (obsoleted by QtMultimediaKit).
Change-Id: I6fbdde1d28f3156aee0bf9caaae7a1e3b3a4392a
Reviewed-on: http://codereview.qt.nokia.com/4105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qtmultimedia | 0 |
3 files changed, 0 insertions, 8 deletions
diff --git a/init-repository b/init-repository index 049af5f3..9e1b4cee 100755 --- a/init-repository +++ b/init-repository @@ -229,7 +229,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdocgallery qtfeedback qtlocation - qtmultimedia qtmultimediakit qtphonon qtpim @@ -11,12 +11,6 @@ module_qtphonon.subdir = $$IN_PWD/qtphonon module_qtphonon.target = module-qtphonon module_qtphonon.depends = module_qtbase -# Disabled and will be removed -module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia -module_qtmultimedia.target = module-qtmultimedia -module_qtmultimedia.depends = module_qtbase -module_qtmultimedia.CONFIG = no_default_target no_default_install - module_qtxmlpatterns.subdir = $$IN_PWD/qtxmlpatterns module_qtxmlpatterns.target = module-qtxmlpatterns module_qtxmlpatterns.depends = module_qtbase @@ -116,7 +110,6 @@ exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative -exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia exists(qttools/qttools.pro): SUBDIRS += module_qttools exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc diff --git a/qtmultimedia b/qtmultimedia deleted file mode 160000 -Subproject e7bda0c3bf066d4a5c7657db301e5353b8862f2 |