diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:48:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 09:00:45 +0200 |
commit | a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 (patch) | |
tree | 6d4835511c823e1ebff312869e51c9ff949f85ad /examples/charts/charts.pro | |
parent | c121fb4ad00bc9617a011e040ef5ed695610a504 (diff) | |
parent | 64d931d5fc5f17b8c4875f6c59f900aa59080881 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/charts/glwidget.cpp
src/charts/xychart/glxyseriesdata_p.h
src/chartsqml2/declarativerendernode.cpp
Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
Diffstat (limited to 'examples/charts/charts.pro')
-rw-r--r-- | examples/charts/charts.pro | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/examples/charts/charts.pro b/examples/charts/charts.pro index 5caa03c6..1db961a7 100644 --- a/examples/charts/charts.pro +++ b/examples/charts/charts.pro @@ -1,50 +1,53 @@ TEMPLATE = subdirs -SUBDIRS += areachart \ +SUBDIRS += \ + areachart \ + barchart \ + barmodelmapper \ + boxplotchart \ + callout \ + 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 \ - legend \ - barmodelmapper \ - lineandbar \ - horizontalbarchart \ - horizontalstackedbarchart \ - horizontalpercentbarchart \ - donutbreakdown \ temperaturerecords \ - donutchart \ - multiaxis \ - legendmarkers \ - logvalueaxis \ - polarchart \ - piechartcustomization \ - dynamicspline \ - nesteddonuts \ - chartinteractions \ - callout \ - chartthemes + zoomlinechart qtHaveModule(quick) { - SUBDIRS += qmlboxplot \ - qmlpiechart \ - qmlweather \ - qmlf1legends \ - qmlcustomizations \ + SUBDIRS += \ qmlaxes \ + qmlboxplot \ + qmlchart \ + qmlcustomizations \ qmlcustomlegend \ + qmlf1legends \ + qmloscilloscope \ + qmlpiechart \ qmlpolarchart \ - qmlchart \ - qmloscilloscope + qmlweather + } qtHaveModule(multimedia) { |