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>
This commit is contained in:
Aaron McCarthy
2012-07-10 13:15:01 +10:00
committed by Qt by Nokia
parent fe4e459e44
commit 107515b047

2
qt.pro
View File

@@ -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