diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-06 09:22:20 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-09-06 11:22:58 +0300 |
| commit | 83d5e7fc85cc07fb180498876d1a346573f747e7 (patch) | |
| tree | c451bf6f083a49fe21244c60b2bb9912c28407cb /examples/charts/charts.pro | |
| parent | 144474348803564eaa7bb4d17bd609d146e74f9f (diff) | |
| parent | bf26aa9d15e525fdcf6fd3f59268418533f06790 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/charts/charts.pro
src/charts/glwidget.cpp
src/chartsqml2/declarativechart.cpp
src/chartsqml2/declarativeopenglrendernode.cpp
tests/auto/auto.pro
Change-Id: If909b4b13844c474bf4898a66ee01ac111d0a248
Diffstat (limited to 'examples/charts/charts.pro')
| -rw-r--r-- | examples/charts/charts.pro | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/examples/charts/charts.pro b/examples/charts/charts.pro index 704d9cc0..b64b464f 100644 --- a/examples/charts/charts.pro +++ b/examples/charts/charts.pro @@ -1,52 +1,55 @@ TEMPLATE = subdirs -SUBDIRS += areachart \ +SUBDIRS += \ + areachart \ + barchart \ + barmodelmapper \ + boxplotchart \ + callout \ + candlestickchart \ + chartinteractions \ + chartthemes \ customchart \ + donutbreakdown \ + donutchart \ + dynamicspline \ + horizontalbarchart \ + horizontalpercentbarchart \ + horizontalstackedbarchart \ + legend \ + legendmarkers \ + lineandbar \ linechart \ + logvalueaxis \ + modeldata \ + multiaxis \ + nesteddonuts \ percentbarchart \ piechart \ + piechartcustomization \ piechartdrilldown \ + polarchart \ scatterchart \ scatterinteractions \ splinechart \ stackedbarchart \ stackedbarchartdrilldown \ - zoomlinechart \ - modeldata \ - barchart \ - boxplotchart \ - candlestickchart \ - legend \ - barmodelmapper \ - lineandbar \ - horizontalbarchart \ - horizontalstackedbarchart \ - horizontalpercentbarchart \ - donutbreakdown \ temperaturerecords \ - donutchart \ - multiaxis \ - legendmarkers \ - logvalueaxis \ - polarchart \ - piechartcustomization \ - dynamicspline \ - nesteddonuts \ - chartinteractions \ - callout \ - chartthemes + zoomlinechart qtHaveModule(quick) { - SUBDIRS += qmlboxplot \ + SUBDIRS += \ + qmlaxes \ + qmlboxplot \ qmlcandlestick \ - qmlpiechart \ - qmlweather \ - qmlf1legends \ + qmlchart \ qmlcustomizations \ - qmlaxes \ qmlcustomlegend \ + qmlf1legends \ + qmloscilloscope \ + qmlpiechart \ qmlpolarchart \ - qmlchart \ - qmloscilloscope + qmlweather + } qtHaveModule(multimedia) { |