lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-add qtmultimedia.

Browse Source 
The contents of QtMultimediaKit are being placed in QtMultimedia.
After this commit integrates, any dependent modules can be updated,
and then another change to remove QtMMK from Qt5 can be done.

Change-Id: I466df08ef1e764fae9056a61a51b82cab8633244
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-26 16:40:48 +10:00
committed by Qt by Nokia
parent 69856eafe4
commit 616ed77b1d
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
init-repository
View File

@@ -229,6 +229,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtdocgallery
qtfeedback
qtlocation
qtmultimedia
qtmultimediakit
qtphonon
qtpim

7
qt.pro
View File

@@ -73,6 +73,12 @@ module_qtsystems.subdir = $$IN_PWD/qtsystems
module_qtsystems.target = module-qtsystems
module_qtsystems.depends = module_qtbase module_qtdeclarative
module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
module_qtmultimedia.target = module-qtmultimedia
module_qtmultimedia.depends = module_qtbase module_qtdeclarative
# Have this turned off to start with so qt5 integrates
module_qtmultimedia.CONFIG = no_default_target no_default_install
module_qtmultimediakit.subdir = $$IN_PWD/qtmultimediakit
module_qtmultimediakit.target = module-qtmultimediakit
module_qtmultimediakit.depends = module_qtbase module_qtdeclarative
@@ -123,6 +129,7 @@ exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
exists(qtactiveqt/qtactiveqt.pro): SUBDIRS += module_qtactiveqt
exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
exists(qtmultimediakit/qtmultimediakit.pro): SUBDIRS += module_qtmultimediakit
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d

1
qtmultimedia Submodule

Submodule qtmultimedia added at b9fd2c65e1