summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2012-07-10 13:15:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-11 08:59:38 +0200
commit107515b0472e0e03ee57f161884b983180c2f41f (patch)
tree5f02b938d5bccaf3485c5c5952f61c27b2dca57f /qt.pro
parentfe4e459e44de1a90eb14498604e112d4ead4cb45 (diff)
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>
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 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