diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-24 09:50:12 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-24 10:16:58 +0300 |
| commit | 33b3fe378486eddddf63a320ebcc5ebb3db0e0d5 (patch) | |
| tree | c72e8ba0ef1f344506c980e94bb83651595d6296 /tests | |
| parent | 9418882d1eb31c06f8e65e8bd6b6f0e9409d8553 (diff) | |
Make build check for existence of quick module.
Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 47 |
2 files changed, 31 insertions, 22 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6f70bd1b..df2943a4 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = qmltest \ - cpptest + +SUBDIRS += cpptest + +qtHaveModule(quick): SUBDIRS += qmltest installed_cmake.depends = cmake diff --git a/tests/tests.pro b/tests/tests.pro index 34ddb5e5..ccecd486 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -7,26 +7,33 @@ contains(QT_CONFIG, opengles1) { TEMPLATE = subdirs -SUBDIRS += barstest \ - scattertest \ - surfacetest \ - qmlcamera \ - qmldynamicdata \ - multigraphs \ - directional \ - qmlmultiwindow \ - itemmodeltest \ - qmlmultitest \ - volumetrictest \ - qmlvolume \ - auto \ - qmlperf +SUBDIRS += auto -#SUBDIRS += kinectsurface +qtHaveModule(quick) { + SUBDIRS += qmlcamera \ + qmldynamicdata \ + qmlmultiwindow \ + qmlmultitest \ + qmlvolume \ + qmlperf +} -qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum +!android:!ios { + SUBDIRS += barstest \ + scattertest \ + surfacetest \ + multigraphs \ + directional \ + itemmodeltest \ + volumetrictest + + # For testing code snippets of minimal applications + SUBDIRS += minimalbars \ + minimalscatter \ + minimalsurface -# For testing code snippets of minimal applications -SUBDIRS += minimalbars \ - minimalscatter \ - minimalsurface + # Requires Kinect drivers + #SUBDIRS += kinectsurface +} + +qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum |