From 5fb5e0dfc7d794df882408d4c7b6c0e14073282b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 2 Jun 2012 14:46:27 +0200
Subject: Remove phonon as discussed on the mailing list

phonon's upstream is in KDE's repositories and the port
to Qt 5 on qt-project is not maintained. So it's only
logical to remove it. KDE frameworks 5 will hopefully
provide a phonon module for Qt 5 again in the future.

Change-Id: I30189d921913868f2253841648ba57b2aaf3650c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
---
 .gitmodules        | 3 ---
 build.dependencies | 1 -
 init-repository    | 1 -
 qt.pro             | 5 -----
 qtphonon           | 1 -
 5 files changed, 11 deletions(-)
 delete mode 160000 qtphonon

diff --git a/.gitmodules b/.gitmodules
index e7d5d1eb..5b0c29ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "qtscript"]
 	path = qtscript
 	url = git://gitorious.org/qt/qtscript.git
-[submodule "qtphonon"]
-	path = qtphonon
-	url = git://gitorious.org/qt/qtphonon.git
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = git://gitorious.org/qt/qtmultimedia.git
diff --git a/build.dependencies b/build.dependencies
index ed13bb68..d6448212 100644
--- a/build.dependencies
+++ b/build.dependencies
@@ -21,7 +21,6 @@ use Config;
     "qtjsondb" => "qtbase,qtdeclarative,qtxmlpatterns",
     "qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb:s",
     "qtmultimedia" => "qtbase,qtdeclarative",
-    "qtphonon" => "qtbase",
     "qtpim" => "qtdeclarative,qtjsondb:s",
     "qtqa" => "qtbase",
     "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s",
diff --git a/init-repository b/init-repository
index b5696f73..0309c1a3 100755
--- a/init-repository
+++ b/init-repository
@@ -234,7 +234,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtjsbackend
     qtlocation
     qtmultimedia
-    qtphonon
     qtpim
     qtqa
     qtquick1
diff --git a/qt.pro b/qt.pro
index 1156c1af..c9918ce3 100644
--- a/qt.pro
+++ b/qt.pro
@@ -10,10 +10,6 @@ module_qtsvg.subdir = qtsvg
 module_qtsvg.target = module-qtsvg
 module_qtsvg.depends = module_qtbase
 
-module_qtphonon.subdir = qtphonon
-module_qtphonon.target = module-qtphonon
-module_qtphonon.depends = module_qtbase
-
 module_qtxmlpatterns.subdir = qtxmlpatterns
 module_qtxmlpatterns.target = module-qtxmlpatterns
 module_qtxmlpatterns.depends = module_qtbase
@@ -171,7 +167,6 @@ exists(qtsystems/qtsystems.pro) {
     # These modules do not require qtsystems, but can use it if it is available
     module_qtlocation.depends += module_qtsystems
 }
-exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
 exists(qtmultimedia/qtmultimedia.pro) {
     SUBDIRS += module_qtmultimedia
     # These modules do not require qtmultimedia, but can use it if it is available
diff --git a/qtphonon b/qtphonon
deleted file mode 160000
index fe98deb3..00000000
--- a/qtphonon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe98deb30cddc17893a31736df48bf4dc095a98d
-- 
cgit v1.2.3