Skip to content
Snippets Groups Projects
Commit 9985003a authored by Toby Tomkins's avatar Toby Tomkins Committed by Qt by Nokia
Browse files

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


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: default avatarRohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@nokia.com>
parent 0c57b507
No related merge requests found
...@@ -82,7 +82,7 @@ module_qtmultimedia.depends = module_qtbase module_qtdeclarative ...@@ -82,7 +82,7 @@ module_qtmultimedia.depends = module_qtbase module_qtdeclarative
module_qtfeedback.subdir = qtfeedback module_qtfeedback.subdir = qtfeedback
module_qtfeedback.target = module-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.subdir = qt3d
module_qt3d.target = module-qt3d module_qt3d.target = module-qt3d
...@@ -158,7 +158,10 @@ exists(qtsystems/qtsystems.pro) { ...@@ -158,7 +158,10 @@ exists(qtsystems/qtsystems.pro) {
module_qtlocation.depends += module_qtsystems module_qtlocation.depends += module_qtsystems
} }
exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon 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(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment