From 1b5490797bff404b3da0b2e86aee5d4c0e011721 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 26 Aug 2011 09:56:03 +1000 Subject: Remove QtMultimedia (obsoleted by QtMultimediaKit). Change-Id: I6fbdde1d28f3156aee0bf9caaae7a1e3b3a4392a Reviewed-on: http://codereview.qt.nokia.com/4105 Reviewed-by: Qt Sanity Bot Reviewed-by: Jonas Rabbe Reviewed-by: Rohan McGovern Reviewed-by: Michael Goddard --- init-repository | 1 - qt.pro | 7 ------- qtmultimedia | 1 - 3 files changed, 9 deletions(-) delete mode 160000 qtmultimedia 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 diff --git a/qt.pro b/qt.pro index adcc72bf..950aa9af 100644 --- a/qt.pro +++ b/qt.pro @@ -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 index e7bda0c3..00000000 --- a/qtmultimedia +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7bda0c3bf066d4a5c7657db301e5353b8862f28 -- cgit v1.2.3