From 86553ef8113259a1e80256ee51de981e416d102e Mon Sep 17 00:00:00 2001 From: Corentin Jabot Date: Sat, 28 Jul 2012 14:31:11 +0200 Subject: [PATCH] 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 Reviewed-by: Michael Goddard --- src/src.pro | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/src.pro b/src/src.pro index 84808882..71122954 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,21 +6,24 @@ SUBDIRS += multimedia src_qgsttools.subdir = gsttools src_qgsttools.depends = multimedia -src_qtmultimediaquicktools.subdir = qtmultimediaquicktools -src_qtmultimediaquicktools.depends = multimedia - src_qtmmwidgets.subdir = multimediawidgets src_qtmmwidgets.depends = multimedia src_plugins.subdir = plugins src_plugins.depends = multimedia -src_imports.subdir = imports -src_imports.depends = multimedia src_qtmultimediaquicktools -SUBDIRS += \ - src_qtmultimediaquicktools \ - src_imports +!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_imports +} # Optional bits !isEmpty(QT.widgets.name) {