From dfd4be11b555010a608cefdacc7a76d092868548 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Fri, 15 Jul 2011 10:55:13 +1000
Subject: 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>
---
 qt.pro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'qt.pro')

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
-- 
cgit v1.2.3