summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-10-26 16:40:48 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-26 09:06:00 +0200
commit616ed77b1d447d7cf6c4896e4a36e3d03aa348c9 (patch)
tree9f04bde5c4e23c55f3d8530a2b28c91f1b248c39 /qt.pro
parent69856eafe42e80566bb2d4b853038b6222948aa3 (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>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/qt.pro b/qt.pro
index 42f609c2..1282c146 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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