The qt quick imports are build only if qtdeclarative is present

If the declarative module is not present, the qtquick/qml plugins
in the imports directory will not be build

Change-Id: I2393b8302f75cbb94d3a85bd70f575817a0a3c34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Corentin Jabot
2012-07-28 14:31:11 +02:00
committed by Qt by Nokia
parent 07c581a52c
commit 86553ef811

View File

@@ -6,21 +6,24 @@ SUBDIRS += multimedia
src_qgsttools.subdir = gsttools src_qgsttools.subdir = gsttools
src_qgsttools.depends = multimedia src_qgsttools.depends = multimedia
src_qtmultimediaquicktools.subdir = qtmultimediaquicktools
src_qtmultimediaquicktools.depends = multimedia
src_qtmmwidgets.subdir = multimediawidgets src_qtmmwidgets.subdir = multimediawidgets
src_qtmmwidgets.depends = multimedia src_qtmmwidgets.depends = multimedia
src_plugins.subdir = plugins src_plugins.subdir = plugins
src_plugins.depends = multimedia src_plugins.depends = multimedia
src_imports.subdir = imports
src_imports.depends = multimedia src_qtmultimediaquicktools
SUBDIRS += \ !isEmpty(QT.quick.name) {
src_qtmultimediaquicktools.subdir = qtmultimediaquicktools
src_qtmultimediaquicktools.depends = multimedia
src_imports.subdir = imports
src_imports.depends = multimedia src_qtmultimediaquicktools
SUBDIRS += \
src_qtmultimediaquicktools \ src_qtmultimediaquicktools \
src_imports src_imports
}
# Optional bits # Optional bits
!isEmpty(QT.widgets.name) { !isEmpty(QT.widgets.name) {