diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-26 16:40:48 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 09:06:00 +0200 |
| commit | 616ed77b1d447d7cf6c4896e4a36e3d03aa348c9 (patch) | |
| tree | 9f04bde5c4e23c55f3d8530a2b28c91f1b248c39 | |
| parent | 69856eafe42e80566bb2d4b853038b6222948aa3 (diff) | |
Re-add qtmultimedia.
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>
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| m--------- | qtmultimedia | 0 |
3 files changed, 8 insertions, 0 deletions
diff --git a/init-repository b/init-repository index dd15d5a9..3a2ed359 100755 --- a/init-repository +++ b/init-repository @@ -229,6 +229,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdocgallery qtfeedback qtlocation + qtmultimedia qtmultimediakit qtphonon qtpim @@ -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 diff --git a/qtmultimedia b/qtmultimedia new file mode 160000 +Subproject b9fd2c65e1f5a66b520687a881c66919300a523 |