mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 01:36:32 +08:00
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>
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -234,7 +234,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
|
||||
qtjsbackend
|
||||
qtlocation
|
||||
qtmultimedia
|
||||
qtphonon
|
||||
qtpim
|
||||
qtqa
|
||||
qtquick1
|
||||
|
||||
5
qt.pro
5
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
|
||||
|
||||
1
qtphonon
1
qtphonon
Submodule qtphonon deleted from fe98deb30c
Reference in New Issue
Block a user