Remove QtMultimedia (obsoleted by QtMultimediaKit). master_201109021333
authorMichael Goddard <michael.goddard@nokia.com>
Thu, 25 Aug 2011 23:56:03 +0000 (09:56 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 2 Sep 2011 03:21:55 +0000 (05:21 +0200)
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>
init-repository
qt.pro
qtmultimedia [deleted submodule]

index 049af5f..9e1b4ce 100755 (executable)
@@ -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 adcc72b..950aa9a 100644 (file)
--- 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 (submodule)
index e7bda0c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7bda0c3bf066d4a5c7657db301e5353b8862f28