lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

qt.pro: change qtfeedback dependency on qtmultimedia to optional.

Browse Source 
qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback
only uses multimedia in the mmk plugin. This change modifies the build
system only as all the required infrastructure changes in qtfeedback
are already present.

Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
This commit is contained in:
Toby Tomkins
2012-05-17 15:10:49 +10:00
committed by Qt by Nokia
parent 0c57b507f3
commit 9985003ac4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qt.pro
View File

@@ -82,7 +82,7 @@ module_qtmultimedia.depends = module_qtbase module_qtdeclarative
module_qtfeedback.subdir = qtfeedback
module_qtfeedback.target = module-qtfeedback
module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
module_qtfeedback.depends = module_qtbase module_qtdeclarative
module_qt3d.subdir = qt3d
module_qt3d.target = module-qt3d
@@ -158,7 +158,10 @@ exists(qtsystems/qtsystems.pro) {
module_qtlocation.depends += module_qtsystems
}
exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
exists(qtmultimedia/qtmultimedia.pro) {
SUBDIRS += module_qtmultimedia
module_qtfeedback.depends += module_qtmultimedia
}
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim