diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
| commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
| tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /examples/datavisualization/datavisualization.pro | |
| parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
| parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) | |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'examples/datavisualization/datavisualization.pro')
| -rw-r--r-- | examples/datavisualization/datavisualization.pro | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/examples/datavisualization/datavisualization.pro b/examples/datavisualization/datavisualization.pro index 1f72820c..b6ece48d 100644 --- a/examples/datavisualization/datavisualization.pro +++ b/examples/datavisualization/datavisualization.pro @@ -1,14 +1,17 @@ TEMPLATE = subdirs -SUBDIRS += qmlbars \ - qmlscatter \ - qmlsurface \ - qmlcustominput \ - qmllegend \ - qmlmultigraph \ - qmloscilloscope \ - qmlsurfacelayers \ - qmlaxisformatter \ - qmlaxisdrag +qtHaveModule(quick) { + SUBDIRS += qmlbars \ + qmlscatter \ + qmlsurface \ + qmlcustominput \ + qmllegend \ + qmlmultigraph \ + qmloscilloscope \ + qmlsurfacelayers \ + qmlaxisformatter \ + qmlaxisdrag \ + qmlspectrogram +} !android:!ios { SUBDIRS += bars \ @@ -19,7 +22,10 @@ SUBDIRS += qmlbars \ surface \ rotations \ draggableaxes \ - customitems + customitems \ + texturesurface \ + volumetric + + qtHaveModule(multimedia): SUBDIRS += audiolevels } -qtHaveModule(multimedia):!android:!ios: SUBDIRS += audiolevels |