From 107515b0472e0e03ee57f161884b983180c2f41f Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Tue, 10 Jul 2012 13:15:01 +1000
Subject: Add soft dependency on Qt Multimedia to Qt Location.

The Qt Location mapviewer example makes use of Qt Multimedia.

Task-number: QTBUG-26468
Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 qt.pro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'qt.pro')

diff --git a/qt.pro b/qt.pro
index f952ac11..1156c1af 100644
--- a/qt.pro
+++ b/qt.pro
@@ -174,7 +174,9 @@ exists(qtsystems/qtsystems.pro) {
 exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
 exists(qtmultimedia/qtmultimedia.pro) {
     SUBDIRS += module_qtmultimedia
+    # These modules do not require qtmultimedia, but can use it if it is available
     module_qtfeedback.depends += module_qtmultimedia
+    module_qtlocation.depends += module_qtmultimedia
 }
 exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
 exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
-- 
cgit v1.2.3