aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-07-15 10:55:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-18 03:40:32 +0200
commitdfd4be11b555010a608cefdacc7a76d092868548 (patch)
treeaeddebb1fda31c93061cf1a8865f228acc3733e9 /qt.pro
parente8fd62c3864af15e907bb4392f90e7506b05619d (diff)
Disable QtMultimedia, since QtMultimediaKit has replaced it.
Change-Id: I41f543d9faa42e3951e6d5f0eb29dd1b867427ca Reviewed-on: http://codereview.qt.nokia.com/1682 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/qt.pro b/qt.pro
index 213abe97..47a2b30d 100644
--- a/qt.pro
+++ b/qt.pro
@@ -11,9 +11,11 @@ module_qtphonon.subdir = $$IN_PWD/qtphonon
module_qtphonon.target = module-qtphonon
module_qtphonon.depends = module_qtbase
+# Disabled and will be removed
module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
module_qtmultimedia.target = module-qtmultimedia
module_qtmultimedia.depends = module_qtbase
+module_qtmultimedia.CONFIG = no_default_target no_default_install
module_qtxmlpatterns.subdir = $$IN_PWD/qtxmlpatterns
module_qtxmlpatterns.target = module-qtxmlpatterns