diff options
author | Corentin Jabot <corentinjabot@gmail.com> | 2012-07-30 10:13:55 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 02:50:41 +0200 |
commit | de70333227709d289a96718009aa7851db5f5df5 (patch) | |
tree | cfffca6e6f34a64ad2598f70b08859949612a075 | |
parent | 7101b0accc5fabf45fa9dce5d74b5172183320a4 (diff) |
Only build qml components/examples if qtdeclarative is present
Change-Id: I31e1873e9ef243c86c07b0a39edc9d1d61820944
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
-rw-r--r-- | examples/sensors/grue/grue.pro | 3 | ||||
-rw-r--r-- | examples/sensors/sensors.pro | 22 | ||||
-rw-r--r-- | src/src.pro | 10 |
3 files changed, 20 insertions, 15 deletions
diff --git a/examples/sensors/grue/grue.pro b/examples/sensors/grue/grue.pro index de917bf7..cc6d11cd 100644 --- a/examples/sensors/grue/grue.pro +++ b/examples/sensors/grue/grue.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs SUBDIRS += lib plugin console_app -SUBDIRS += import qml.pro + +!isEmpty(QT.quick.name): SUBDIRS += import qml.pro plugin.depends = lib import.depends = lib diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro index 0c894d61..7fe9a092 100644 --- a/examples/sensors/sensors.pro +++ b/examples/sensors/sensors.pro @@ -1,15 +1,17 @@ TEMPLATE = subdirs -SUBDIRS += \ - accel \ - accelbubble \ - cubehouse \ - grue \ - qmlsensorgestures \ - maze \ - qmlqtsensors \ - sensor_explorer \ - shakeit +SUBDIRS += accel grue + +!isEmpty(QT.quick.name) { + SUBDIRS += \ + accelbubble \ + cubehouse \ + qmlsensorgestures \ + maze \ + qmlqtsensors \ + sensor_explorer \ + shakeit +} !isEmpty(QT.widgets.name):SUBDIRS += \ sensorgestures diff --git a/src/src.pro b/src/src.pro index 26f89a1f..4ea98a97 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,10 +4,12 @@ SUBDIRS += sensors sensors.subdir = sensors sensors.target = sub-sensors -SUBDIRS += imports -imports.subdir = imports -imports.target = sub-imports -imports.depends = sensors +!isEmpty(QT.quick.name) { + SUBDIRS += imports + imports.subdir = imports + imports.target = sub-imports + imports.depends = sensors +} SUBDIRS += plugins plugins.subdir = plugins |