The qt quick imports are build only if qtdeclarative is present
authorCorentin Jabot <corentinjabot@gmail.com>
Sat, 28 Jul 2012 12:31:11 +0000 (14:31 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 2 Aug 2012 05:29:41 +0000 (07:29 +0200)
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>
src/src.pro

index 8480888..7112295 100644 (file)
@@ -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) {