summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf4
-rw-r--r--charts.pro91
-rw-r--r--config.pri127
-rw-r--r--demos/audio/audio.pro13
-rw-r--r--demos/audio/widget.cpp82
-rw-r--r--demos/audio/widget.h52
-rw-r--r--demos/audio/xyseriesiodevice.h47
-rw-r--r--demos/callout/callout.pro15
-rw-r--r--demos/callout/view.h59
-rw-r--r--demos/chartinteractions/chart.h53
-rw-r--r--demos/chartinteractions/chartinteractions.pro9
-rw-r--r--demos/chartinteractions/chartview.h45
-rw-r--r--demos/chartinteractions/main.cpp74
-rw-r--r--demos/chartthemes/chartthemes.pro4
-rw-r--r--demos/chartthemes/themewidget.h77
-rw-r--r--demos/demos.pri39
-rw-r--r--demos/demos.pro34
-rw-r--r--demos/dynamicspline/chart.h56
-rw-r--r--demos/dynamicspline/dynamicspline.pro4
-rw-r--r--demos/dynamicspline/main.cpp42
-rw-r--r--demos/nesteddonuts/nesteddonuts.pro8
-rw-r--r--demos/nesteddonuts/widget.cpp128
-rw-r--r--demos/nesteddonuts/widget.h47
-rw-r--r--demos/piechartcustomization/customslice.cpp48
-rw-r--r--demos/piechartcustomization/customslice.h44
-rw-r--r--demos/piechartcustomization/mainwidget.cpp360
-rw-r--r--demos/piechartcustomization/mainwidget.h93
-rw-r--r--demos/piechartcustomization/piechartcustomization.pro15
-rw-r--r--demos/qmlaxes/main.cpp42
-rw-r--r--demos/qmlaxes/qml/qmlaxes/View1.qml67
-rw-r--r--demos/qmlaxes/qml/qmlaxes/View2.qml59
-rw-r--r--demos/qmlaxes/qml/qmlaxes/View3.qml67
-rw-r--r--demos/qmlaxes/qml/qmlaxes/loader.qml37
-rw-r--r--demos/qmlaxes/qml/qmlaxes/main.qml90
-rw-r--r--demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlaxes/qmlaxes.pro9
-rw-r--r--demos/qmlaxes/resources.qrc9
-rw-r--r--demos/qmlchart/main.cpp43
-rw-r--r--demos/qmlchart/qml/qmlchart/View1.qml51
-rw-r--r--demos/qmlchart/qml/qmlchart/View10.qml41
-rw-r--r--demos/qmlchart/qml/qmlchart/View11.qml42
-rw-r--r--demos/qmlchart/qml/qmlchart/View12.qml76
-rw-r--r--demos/qmlchart/qml/qmlchart/View2.qml44
-rw-r--r--demos/qmlchart/qml/qmlchart/View3.qml44
-rw-r--r--demos/qmlchart/qml/qmlchart/View4.qml108
-rw-r--r--demos/qmlchart/qml/qmlchart/View5.qml56
-rw-r--r--demos/qmlchart/qml/qmlchart/View6.qml42
-rw-r--r--demos/qmlchart/qml/qmlchart/View7.qml42
-rw-r--r--demos/qmlchart/qml/qmlchart/View8.qml41
-rw-r--r--demos/qmlchart/qml/qmlchart/View9.qml42
-rw-r--r--demos/qmlchart/qml/qmlchart/loader.qml37
-rw-r--r--demos/qmlchart/qml/qmlchart/main.qml89
-rw-r--r--demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlchart/qmlchart.pro9
-rw-r--r--demos/qmlchart/qmlchart.svg93
-rw-r--r--demos/qmlchart/resources.qrc18
-rw-r--r--demos/qmlcustomizations/main.cpp43
-rw-r--r--demos/qmlcustomizations/qml/qmlcustomizations/loader.qml37
-rw-r--r--demos/qmlcustomizations/qml/qmlcustomizations/main.qml101
-rw-r--r--demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlcustomizations/qmlcustomizations.pro9
-rw-r--r--demos/qmlcustomizations/resources.qrc6
-rw-r--r--demos/qmlcustomlegend/main.cpp43
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/AnimatedAreaSeries.qml30
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml76
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewSelector.qml100
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml116
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml135
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/loader.qml37
-rwxr-xr-xdemos/qmlcustomlegend/qml/qmlcustomlegend/main.qml66
-rw-r--r--demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri13
-rwxr-xr-xdemos/qmlcustomlegend/qmlcustomlegend.pro9
-rwxr-xr-xdemos/qmlcustomlegend/resources.qrc11
-rw-r--r--demos/qmlf1legends/main.cpp43
-rw-r--r--demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml96
-rw-r--r--demos/qmlf1legends/qml/qmlf1legends/main.qml93
-rw-r--r--demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlf1legends/qmlf1legends.pro9
-rw-r--r--demos/qmloscilloscope/datasource.cpp95
-rw-r--r--demos/qmloscilloscope/datasource.h50
-rw-r--r--demos/qmloscilloscope/main.cpp47
-rw-r--r--demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml86
-rw-r--r--demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml54
-rw-r--r--demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml116
-rw-r--r--demos/qmloscilloscope/qml/qmloscilloscope/main.qml62
-rw-r--r--demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmloscilloscope/qmloscilloscope.pro13
-rw-r--r--demos/qmlpolarchart/main.cpp43
-rw-r--r--demos/qmlpolarchart/qml/qmlpolarchart/View1.qml68
-rw-r--r--demos/qmlpolarchart/qml/qmlpolarchart/View2.qml89
-rw-r--r--demos/qmlpolarchart/qml/qmlpolarchart/View3.qml76
-rw-r--r--demos/qmlpolarchart/qml/qmlpolarchart/loader.qml37
-rw-r--r--demos/qmlpolarchart/qml/qmlpolarchart/main.qml90
-rw-r--r--demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlpolarchart/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlpolarchart/qmlpolarchart.pro9
-rw-r--r--demos/qmlpolarchart/resources.qrc9
-rw-r--r--demos/qmlweather/main.cpp52
-rw-r--r--demos/qmlweather/qml/qmlweather/main.qml200
-rw-r--r--demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--demos/qmlweather/qmlweather.pro10
-rw-r--r--demos/quick2chart/main.cpp42
-rw-r--r--demos/quick2chart/qml/quick2chart/View1.qml54
-rw-r--r--demos/quick2chart/qml/quick2chart/View10.qml42
-rw-r--r--demos/quick2chart/qml/quick2chart/View11.qml43
-rw-r--r--demos/quick2chart/qml/quick2chart/View12.qml77
-rw-r--r--demos/quick2chart/qml/quick2chart/View2.qml45
-rw-r--r--demos/quick2chart/qml/quick2chart/View3.qml45
-rw-r--r--demos/quick2chart/qml/quick2chart/View4.qml109
-rw-r--r--demos/quick2chart/qml/quick2chart/View5.qml57
-rw-r--r--demos/quick2chart/qml/quick2chart/View6.qml43
-rw-r--r--demos/quick2chart/qml/quick2chart/View7.qml43
-rw-r--r--demos/quick2chart/qml/quick2chart/View8.qml42
-rw-r--r--demos/quick2chart/qml/quick2chart/View9.qml43
-rw-r--r--demos/quick2chart/qml/quick2chart/loader.qml37
-rw-r--r--demos/quick2chart/qml/quick2chart/main.qml91
-rw-r--r--demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp87
-rw-r--r--demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.h33
-rw-r--r--demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.pri6
-rw-r--r--demos/quick2chart/quick2chart.pro10
-rw-r--r--demos/quick2chart/resources.qrc18
-rw-r--r--demos/quick2oscilloscope/datasource.cpp91
-rw-r--r--demos/quick2oscilloscope/datasource.h49
-rw-r--r--demos/quick2oscilloscope/main.cpp48
-rw-r--r--demos/quick2oscilloscope/qml/quick2oscilloscope/ControlPanel.qml86
-rw-r--r--demos/quick2oscilloscope/qml/quick2oscilloscope/MultiButton.qml54
-rw-r--r--demos/quick2oscilloscope/qml/quick2oscilloscope/ScopeView.qml116
-rw-r--r--demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml64
-rw-r--r--demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp87
-rw-r--r--demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h33
-rw-r--r--demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.pri6
-rw-r--r--demos/quick2oscilloscope/quick2oscilloscope.pro13
-rw-r--r--demos/quick2oscilloscope/resources.qrc8
-rw-r--r--doc/docconf/compat.qdocconf31
-rw-r--r--doc/docconf/macros.qdocconf37
-rw-r--r--doc/docconf/qchart-html-template.qdocconf49
-rw-r--r--doc/docconf/qchart-html.qdocconf53
-rw-r--r--doc/docconf/qchart-qch.qdocconf44
-rw-r--r--doc/docconf/qcharts-qt4.qdocconf7
-rw-r--r--doc/docconf/qcharts-qt5.qdocconf15
-rw-r--r--doc/docconf/qcharts.qdocconf44
-rw-r--r--doc/src/abstractaxis.qdocinc6
-rw-r--r--doc/src/abstractbarseries.qdocinc9
-rw-r--r--doc/src/abstractseries.qdocinc2
-rw-r--r--doc/src/areaseries.qdocinc8
-rw-r--r--doc/src/barcategoryaxis.qdocinc17
-rw-r--r--doc/src/barseries.qdocinc8
-rw-r--r--doc/src/barset.qdocinc5
-rw-r--r--doc/src/categoryaxis.qdocinc12
-rw-r--r--doc/src/categoryrange.qdocinc2
-rw-r--r--doc/src/chartview.qdocinc11
-rw-r--r--doc/src/classes.qdoc102
-rw-r--r--doc/src/datetimeaxis.qdocinc6
-rw-r--r--doc/src/declarativeboxplotseries.qdocinc34
-rw-r--r--doc/src/declarativeboxset.qdocinc6
-rw-r--r--doc/src/declarativepolarchart.qdocinc20
-rw-r--r--doc/src/declarativexypoint.qdocinc3
-rw-r--r--doc/src/demos-audio.qdoc8
-rw-r--r--doc/src/demos-callout.qdoc14
-rw-r--r--doc/src/demos-chartthemes.qdoc13
-rw-r--r--doc/src/demos-dynamicspline.qdoc10
-rw-r--r--doc/src/demos-nesteddonuts.qdoc50
-rw-r--r--doc/src/demos-piechartcustomization.qdoc8
-rw-r--r--doc/src/demos-qmlaxes.qdoc32
-rw-r--r--doc/src/demos-qmlchart.qdoc118
-rw-r--r--doc/src/demos-qmlcustomizations.qdoc26
-rw-r--r--doc/src/demos-qmlcustomlegend.qdoc40
-rw-r--r--doc/src/demos-qmlf1legends.qdoc20
-rw-r--r--doc/src/demos-qmloscilloscope.qdoc37
-rw-r--r--doc/src/demos-qmlpolarchart.qdoc33
-rw-r--r--doc/src/demos-qmlweather.qdoc32
-rw-r--r--doc/src/demos-quick2chart.qdoc15
-rw-r--r--doc/src/demos-quick2oscilloscope.qdoc16
-rw-r--r--doc/src/examples-areachart.qdoc30
-rw-r--r--doc/src/examples-barchart.qdoc45
-rw-r--r--doc/src/examples-barmodelmapper.qdoc57
-rw-r--r--doc/src/examples-boxplotchart.qdoc76
-rw-r--r--doc/src/examples-customchart.qdoc26
-rw-r--r--doc/src/examples-datetimeaxis.qdoc38
-rw-r--r--doc/src/examples-donutbreakdown.qdoc45
-rw-r--r--doc/src/examples-donutchart.qdoc8
-rw-r--r--doc/src/examples-horizontalbarchart.qdoc48
-rw-r--r--doc/src/examples-horizontalpercentbarchart.qdoc54
-rw-r--r--doc/src/examples-horizontalstackedbarchart.qdoc51
-rw-r--r--doc/src/examples-legend.qdoc32
-rw-r--r--doc/src/examples-legendmarkers.qdoc41
-rw-r--r--doc/src/examples-lineandbarchart.qdoc46
-rw-r--r--doc/src/examples-linechart.qdoc30
-rw-r--r--doc/src/examples-logvalueaxis.qdoc30
-rw-r--r--doc/src/examples-modeldata.qdoc58
-rw-r--r--doc/src/examples-multiaxis.qdoc36
-rw-r--r--doc/src/examples-percentbarchart.qdoc53
-rw-r--r--doc/src/examples-piechart.qdoc8
-rw-r--r--doc/src/examples-piechartdrilldown.qdoc9
-rw-r--r--doc/src/examples-polarchart.qdoc33
-rw-r--r--doc/src/examples-scatterchart.qdoc39
-rw-r--r--doc/src/examples-scatterinteractions.qdoc9
-rw-r--r--doc/src/examples-splinechart.qdoc29
-rw-r--r--doc/src/examples-stackedbarchart.qdoc51
-rw-r--r--doc/src/examples-stackedbarchartdrilldown.qdoc45
-rw-r--r--doc/src/examples-temperaturerecords.qdoc44
-rw-r--r--doc/src/examples-zoomlinechart.qdoc31
-rw-r--r--doc/src/gettingstarted.qdoc73
-rw-r--r--doc/src/hbarmodelmapper.qdocinc17
-rw-r--r--doc/src/horizontalbarseries.qdocinc8
-rw-r--r--doc/src/horizontalpercentbarseries.qdocinc8
-rw-r--r--doc/src/horizontalstackedbarseries.qdocinc8
-rw-r--r--doc/src/hpiemodelmapper.qdocinc16
-rw-r--r--doc/src/hxymodelmapper.qdocinc3
-rw-r--r--doc/src/legend.qdocinc17
-rw-r--r--doc/src/lineseries.qdocinc8
-rw-r--r--doc/src/logvalueaxis.qdocinc7
-rw-r--r--doc/src/margins.qdocinc1
-rw-r--r--doc/src/persentbarseries.qdocinc8
-rw-r--r--doc/src/pieseries.qdocinc10
-rw-r--r--doc/src/pieslice.qdocinc12
-rw-r--r--doc/src/scatterseries.qdocinc9
-rw-r--r--doc/src/splineseries.qdocinc8
-rw-r--r--doc/src/stackedbarseries.qdocinc8
-rw-r--r--doc/src/tutorials.qdoc6
-rw-r--r--doc/src/valueaxis.qdocinc17
-rw-r--r--doc/src/vbarmodelmapper.qdocinc19
-rw-r--r--doc/src/vboxplotmodelmapper.qdocinc18
-rw-r--r--doc/src/vpiemodelmapper.qdocinc16
-rw-r--r--doc/src/vxymodelmapper.qdocinc3
-rw-r--r--doc/src/xyseries.qdocinc4
-rw-r--r--doc/src_qt4/demos.qdoc78
-rw-r--r--doc/src_qt4/examples.qdoc147
-rw-r--r--doc/src_qt4/index.qdoc43
-rw-r--r--doc/src_qt4/qml.qdoc113
-rw-r--r--doc/src_qt5/demos.qdoc78
-rw-r--r--doc/src_qt5/examples.qdoc147
-rw-r--r--doc/src_qt5/index.qdoc43
-rw-r--r--doc/src_qt5/qml.qdoc113
-rw-r--r--doc/src_qt5/qmlmodule.qdoc3
-rw-r--r--examples/areachart/main.cpp81
-rw-r--r--examples/barchart/main.cpp93
-rw-r--r--examples/barmodelmapper/tablewidget.cpp117
-rw-r--r--examples/boxplotchart/boxdatareader.h43
-rw-r--r--examples/boxplotchart/main.cpp105
-rw-r--r--examples/charts/areachart/areachart.pro (renamed from examples/areachart/areachart.pro)0
-rw-r--r--examples/charts/areachart/main.cpp81
-rw-r--r--examples/charts/audio/audio.pro15
-rw-r--r--examples/charts/audio/main.cpp (renamed from demos/audio/main.cpp)0
-rw-r--r--examples/charts/audio/widget.cpp82
-rw-r--r--examples/charts/audio/widget.h52
-rw-r--r--examples/charts/audio/xyseriesiodevice.cpp (renamed from demos/audio/xyseriesiodevice.cpp)0
-rw-r--r--examples/charts/audio/xyseriesiodevice.h47
-rw-r--r--examples/charts/barchart/barchart.pro (renamed from examples/barchart/barchart.pro)0
-rw-r--r--examples/charts/barchart/main.cpp93
-rw-r--r--examples/charts/barmodelmapper/barmodelmapper.pro (renamed from examples/barmodelmapper/barmodelmapper.pro)0
-rw-r--r--examples/charts/barmodelmapper/customtablemodel.cpp (renamed from examples/barmodelmapper/customtablemodel.cpp)0
-rw-r--r--examples/charts/barmodelmapper/customtablemodel.h (renamed from examples/barmodelmapper/customtablemodel.h)0
-rw-r--r--examples/charts/barmodelmapper/main.cpp (renamed from examples/barmodelmapper/main.cpp)0
-rw-r--r--examples/charts/barmodelmapper/tablewidget.cpp112
-rw-r--r--examples/charts/barmodelmapper/tablewidget.h (renamed from examples/barmodelmapper/tablewidget.h)0
-rw-r--r--examples/charts/boxplotchart/acme_data.txt (renamed from examples/boxplotchart/acme_data.txt)0
-rw-r--r--examples/charts/boxplotchart/boxdatareader.cpp (renamed from examples/boxplotchart/boxdatareader.cpp)0
-rw-r--r--examples/charts/boxplotchart/boxdatareader.h43
-rw-r--r--examples/charts/boxplotchart/boxplotchart.pro (renamed from examples/boxplotchart/boxplotchart.pro)0
-rw-r--r--examples/charts/boxplotchart/boxplotdata.qrc (renamed from examples/boxplotchart/boxplotdata.qrc)0
-rw-r--r--examples/charts/boxplotchart/boxwhisk_data.txt (renamed from examples/boxplotchart/boxwhisk_data.txt)0
-rw-r--r--examples/charts/boxplotchart/main.cpp105
-rw-r--r--examples/charts/callout/callout.cpp (renamed from demos/callout/callout.cpp)0
-rw-r--r--examples/charts/callout/callout.h (renamed from demos/callout/callout.h)0
-rw-r--r--examples/charts/callout/callout.pro15
-rw-r--r--examples/charts/callout/main.cpp (renamed from demos/callout/main.cpp)0
-rw-r--r--examples/charts/callout/view.cpp (renamed from demos/callout/view.cpp)0
-rw-r--r--examples/charts/callout/view.h59
-rw-r--r--examples/charts/chartinteractions/chart.cpp (renamed from demos/chartinteractions/chart.cpp)0
-rw-r--r--examples/charts/chartinteractions/chart.h53
-rw-r--r--examples/charts/chartinteractions/chartinteractions.pro11
-rw-r--r--examples/charts/chartinteractions/chartview.cpp (renamed from demos/chartinteractions/chartview.cpp)0
-rw-r--r--examples/charts/chartinteractions/chartview.h45
-rw-r--r--examples/charts/chartinteractions/main.cpp74
-rw-r--r--examples/charts/charts.pro60
-rw-r--r--examples/charts/chartthemes/chartthemes.pro7
-rw-r--r--examples/charts/chartthemes/main.cpp (renamed from demos/chartthemes/main.cpp)0
-rw-r--r--examples/charts/chartthemes/themewidget.cpp (renamed from demos/chartthemes/themewidget.cpp)0
-rw-r--r--examples/charts/chartthemes/themewidget.h77
-rw-r--r--examples/charts/customchart/customchart.pro (renamed from examples/customchart/customchart.pro)0
-rw-r--r--examples/charts/customchart/main.cpp131
-rw-r--r--examples/charts/datetimeaxis/datetimeaxis.pro (renamed from examples/datetimeaxis/datetimeaxis.pro)0
-rw-r--r--examples/charts/datetimeaxis/main.cpp100
-rw-r--r--examples/charts/datetimeaxis/sun_spots.txt (renamed from examples/datetimeaxis/sun_spots.txt)0
-rw-r--r--examples/charts/datetimeaxis/sundata.qrc (renamed from examples/datetimeaxis/sundata.qrc)0
-rw-r--r--examples/charts/donutbreakdown/donutbreakdown.pro (renamed from examples/donutbreakdown/donutbreakdown.pro)0
-rw-r--r--examples/charts/donutbreakdown/donutbreakdownchart.cpp110
-rw-r--r--examples/charts/donutbreakdown/donutbreakdownchart.h42
-rw-r--r--examples/charts/donutbreakdown/main.cpp77
-rw-r--r--examples/charts/donutbreakdown/mainslice.cpp57
-rw-r--r--examples/charts/donutbreakdown/mainslice.h48
-rw-r--r--examples/charts/donutchart/donutchart.pro (renamed from examples/donutchart/donutchart.pro)0
-rw-r--r--examples/charts/donutchart/main.cpp62
-rw-r--r--examples/charts/dynamicspline/chart.cpp (renamed from demos/dynamicspline/chart.cpp)0
-rw-r--r--examples/charts/dynamicspline/chart.h56
-rw-r--r--examples/charts/dynamicspline/dynamicspline.pro7
-rw-r--r--examples/charts/dynamicspline/main.cpp42
-rw-r--r--examples/charts/examples.pri17
-rw-r--r--examples/charts/horizontalbarchart/horizontalbarchart.pro (renamed from examples/horizontalbarchart/horizontalbarchart.pro)0
-rw-r--r--examples/charts/horizontalbarchart/main.cpp96
-rw-r--r--examples/charts/horizontalpercentbarchart/horizontalpercentbarchart.pro (renamed from examples/horizontalpercentbarchart/horizontalpercentbarchart.pro)0
-rw-r--r--examples/charts/horizontalpercentbarchart/main.cpp94
-rw-r--r--examples/charts/horizontalstackedbarchart/horizontalstackedbarchart.pro (renamed from examples/horizontalstackedbarchart/horizontalstackedbarchart.pro)0
-rw-r--r--examples/charts/horizontalstackedbarchart/main.cpp94
-rw-r--r--examples/charts/legend/legend.pro (renamed from examples/legend/legend.pro)0
-rw-r--r--examples/charts/legend/main.cpp37
-rw-r--r--examples/charts/legend/mainwidget.cpp247
-rw-r--r--examples/charts/legend/mainwidget.h78
-rw-r--r--examples/charts/legendmarkers/legendmarkers.pro (renamed from examples/legendmarkers/legendmarkers.pro)0
-rw-r--r--examples/charts/legendmarkers/main.cpp (renamed from examples/legendmarkers/main.cpp)0
-rw-r--r--examples/charts/legendmarkers/mainwidget.cpp177
-rw-r--r--examples/charts/legendmarkers/mainwidget.h62
-rw-r--r--examples/charts/lineandbar/lineandbar.pro (renamed from examples/lineandbar/lineandbar.pro)0
-rw-r--r--examples/charts/lineandbar/main.cpp111
-rw-r--r--examples/charts/linechart/linechart.pro (renamed from examples/linechart/linechart.pro)0
-rw-r--r--examples/charts/linechart/main.cpp67
-rw-r--r--examples/charts/logvalueaxis/logvalueaxis.pro (renamed from examples/logvalueaxis/logvalueaxis.pro)0
-rw-r--r--examples/charts/logvalueaxis/main.cpp75
-rw-r--r--examples/charts/modeldata/customtablemodel.cpp (renamed from examples/modeldata/customtablemodel.cpp)0
-rw-r--r--examples/charts/modeldata/customtablemodel.h (renamed from examples/modeldata/customtablemodel.h)0
-rw-r--r--examples/charts/modeldata/main.cpp (renamed from examples/modeldata/main.cpp)0
-rw-r--r--examples/charts/modeldata/modeldata.pro (renamed from examples/modeldata/modeldata.pro)0
-rw-r--r--examples/charts/modeldata/tablewidget.cpp112
-rw-r--r--examples/charts/modeldata/tablewidget.h (renamed from examples/modeldata/tablewidget.h)0
-rw-r--r--examples/charts/multiaxis/main.cpp92
-rw-r--r--examples/charts/multiaxis/multiaxis.pro (renamed from examples/multiaxis/multiaxis.pro)0
-rw-r--r--examples/charts/nesteddonuts/main.cpp (renamed from demos/nesteddonuts/main.cpp)0
-rw-r--r--examples/charts/nesteddonuts/nesteddonuts.pro8
-rw-r--r--examples/charts/nesteddonuts/widget.cpp128
-rw-r--r--examples/charts/nesteddonuts/widget.h47
-rw-r--r--examples/charts/percentbarchart/main.cpp93
-rw-r--r--examples/charts/percentbarchart/percentbarchart.pro (renamed from examples/percentbarchart/percentbarchart.pro)0
-rw-r--r--examples/charts/piechart/main.cpp70
-rw-r--r--examples/charts/piechart/piechart.pro (renamed from examples/piechart/piechart.pro)0
-rw-r--r--examples/charts/piechartcustomization/brushtool.cpp (renamed from demos/piechartcustomization/brushtool.cpp)0
-rw-r--r--examples/charts/piechartcustomization/brushtool.h (renamed from demos/piechartcustomization/brushtool.h)0
-rw-r--r--examples/charts/piechartcustomization/customslice.cpp48
-rw-r--r--examples/charts/piechartcustomization/customslice.h44
-rw-r--r--examples/charts/piechartcustomization/main.cpp (renamed from demos/piechartcustomization/main.cpp)0
-rw-r--r--examples/charts/piechartcustomization/mainwidget.cpp360
-rw-r--r--examples/charts/piechartcustomization/mainwidget.h93
-rw-r--r--examples/charts/piechartcustomization/pentool.cpp (renamed from demos/piechartcustomization/pentool.cpp)0
-rw-r--r--examples/charts/piechartcustomization/pentool.h (renamed from demos/piechartcustomization/pentool.h)0
-rw-r--r--examples/charts/piechartcustomization/piechartcustomization.pro16
-rw-r--r--examples/charts/piechartdrilldown/drilldownchart.cpp54
-rw-r--r--examples/charts/piechartdrilldown/drilldownchart.h47
-rw-r--r--examples/charts/piechartdrilldown/drilldownslice.cpp63
-rw-r--r--examples/charts/piechartdrilldown/drilldownslice.h49
-rw-r--r--examples/charts/piechartdrilldown/main.cpp77
-rw-r--r--examples/charts/piechartdrilldown/piechartdrilldown.pro (renamed from examples/piechartdrilldown/piechartdrilldown.pro)0
-rw-r--r--examples/charts/polarchart/chartview.cpp111
-rw-r--r--examples/charts/polarchart/chartview.h41
-rw-r--r--examples/charts/polarchart/main.cpp137
-rw-r--r--examples/charts/polarchart/polarchart.pro (renamed from examples/polarchart/polarchart.pro)0
-rw-r--r--examples/charts/qmlaxes/main.cpp50
-rw-r--r--examples/charts/qmlaxes/qml/qmlaxes/View1.qml68
-rw-r--r--examples/charts/qmlaxes/qml/qmlaxes/View2.qml60
-rw-r--r--examples/charts/qmlaxes/qml/qmlaxes/View3.qml68
-rw-r--r--examples/charts/qmlaxes/qml/qmlaxes/main.qml80
-rw-r--r--examples/charts/qmlaxes/qmlaxes.pro7
-rw-r--r--examples/charts/qmlaxes/resources.qrc8
-rw-r--r--examples/charts/qmlboxplot/main.cpp50
-rw-r--r--examples/charts/qmlboxplot/qml/qmlboxplot/main.qml41
-rw-r--r--examples/charts/qmlboxplot/qmlboxplot.pro9
-rw-r--r--examples/charts/qmlboxplot/resources.qrc (renamed from examples/qmlboxplot/resources.qrc)0
-rw-r--r--examples/charts/qmlchart/main.cpp50
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View1.qml54
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View10.qml42
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View11.qml43
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View12.qml77
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View2.qml45
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View3.qml45
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View4.qml108
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View5.qml56
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View6.qml43
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View7.qml43
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View8.qml42
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/View9.qml43
-rw-r--r--examples/charts/qmlchart/qml/qmlchart/main.qml91
-rw-r--r--examples/charts/qmlchart/qmlchart.pro7
-rw-r--r--examples/charts/qmlchart/resources.qrc17
-rw-r--r--examples/charts/qmlcustomizations/main.cpp49
-rw-r--r--examples/charts/qmlcustomizations/qml/qmlcustomizations/main.qml102
-rw-r--r--examples/charts/qmlcustomizations/qmlcustomizations.pro7
-rw-r--r--examples/charts/qmlcustomizations/resources.qrc5
-rw-r--r--examples/charts/qmlcustomlegend/main.cpp49
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/AnimatedAreaSeries.qml30
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml77
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/ChartViewSelector.qml100
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml117
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml136
-rw-r--r--examples/charts/qmlcustomlegend/qml/qmlcustomlegend/main.qml66
-rw-r--r--examples/charts/qmlcustomlegend/qmlcustomlegend.pro7
-rw-r--r--examples/charts/qmlcustomlegend/resources.qrc10
-rw-r--r--examples/charts/qmlf1legends/main.cpp49
-rw-r--r--examples/charts/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml95
-rw-r--r--examples/charts/qmlf1legends/qml/qmlf1legends/main.qml95
-rw-r--r--examples/charts/qmlf1legends/qmlf1legends.pro7
-rw-r--r--examples/charts/qmlf1legends/resources.qrc (renamed from demos/qmlf1legends/resources.qrc)0
-rw-r--r--examples/charts/qmloscilloscope/datasource.cpp91
-rw-r--r--examples/charts/qmloscilloscope/datasource.h49
-rw-r--r--examples/charts/qmloscilloscope/main.cpp56
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml88
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml60
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml115
-rw-r--r--examples/charts/qmloscilloscope/qml/qmloscilloscope/main.qml61
-rw-r--r--examples/charts/qmloscilloscope/qmloscilloscope.pro11
-rw-r--r--examples/charts/qmloscilloscope/resources.qrc (renamed from demos/qmloscilloscope/resources.qrc)0
-rw-r--r--examples/charts/qmlpiechart/main.cpp49
-rw-r--r--examples/charts/qmlpiechart/qml/qmlpiechart/main.qml54
-rw-r--r--examples/charts/qmlpiechart/qmlpiechart.pro7
-rw-r--r--examples/charts/qmlpiechart/qmlpiechart.svg (renamed from examples/qmlpiechart/qmlpiechart.svg)0
-rw-r--r--examples/charts/qmlpiechart/resources.qrc (renamed from examples/qmlpiechart/resources.qrc)0
-rw-r--r--examples/charts/qmlpolarchart/main.cpp49
-rw-r--r--examples/charts/qmlpolarchart/qml/qmlpolarchart/View1.qml69
-rw-r--r--examples/charts/qmlpolarchart/qml/qmlpolarchart/View2.qml90
-rw-r--r--examples/charts/qmlpolarchart/qml/qmlpolarchart/View3.qml77
-rw-r--r--examples/charts/qmlpolarchart/qml/qmlpolarchart/main.qml80
-rw-r--r--examples/charts/qmlpolarchart/qmlpolarchart.pro7
-rw-r--r--examples/charts/qmlpolarchart/resources.qrc8
-rw-r--r--examples/charts/qmlweather/main.cpp59
-rw-r--r--examples/charts/qmlweather/qml/qmlweather/main.qml201
-rw-r--r--examples/charts/qmlweather/qmlweather.pro7
-rw-r--r--examples/charts/qmlweather/resources.qrc (renamed from demos/qmlweather/resources.qrc)0
-rw-r--r--examples/charts/scatterchart/chartview.cpp (renamed from examples/scatterchart/chartview.cpp)0
-rw-r--r--examples/charts/scatterchart/chartview.h35
-rw-r--r--examples/charts/scatterchart/main.cpp40
-rw-r--r--examples/charts/scatterchart/scatterchart.pro (renamed from examples/scatterchart/scatterchart.pro)0
-rw-r--r--examples/charts/scatterinteractions/chartview.cpp79
-rw-r--r--examples/charts/scatterinteractions/chartview.h46
-rw-r--r--examples/charts/scatterinteractions/main.cpp (renamed from examples/scatterinteractions/main.cpp)0
-rw-r--r--examples/charts/scatterinteractions/scatterinteractions.pro (renamed from examples/scatterinteractions/scatterinteractions.pro)0
-rw-r--r--examples/charts/splinechart/main.cpp68
-rw-r--r--examples/charts/splinechart/splinechart.pro (renamed from examples/splinechart/splinechart.pro)0
-rw-r--r--examples/charts/stackedbarchart/main.cpp93
-rw-r--r--examples/charts/stackedbarchart/stackedbarchart.pro (renamed from examples/stackedbarchart/stackedbarchart.pro)0
-rw-r--r--examples/charts/stackedbarchartdrilldown/drilldownchart.cpp60
-rw-r--r--examples/charts/stackedbarchartdrilldown/drilldownchart.h46
-rw-r--r--examples/charts/stackedbarchartdrilldown/drilldownseries.cpp46
-rw-r--r--examples/charts/stackedbarchartdrilldown/drilldownseries.h48
-rw-r--r--examples/charts/stackedbarchartdrilldown/main.cpp113
-rw-r--r--examples/charts/stackedbarchartdrilldown/stackedbarchartdrilldown.pro (renamed from examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro)0
-rw-r--r--examples/charts/temperaturerecords/main.cpp88
-rw-r--r--examples/charts/temperaturerecords/temperaturerecords.pro (renamed from examples/temperaturerecords/temperaturerecords.pro)0
-rw-r--r--examples/charts/zoomlinechart/chart.cpp (renamed from examples/zoomlinechart/chart.cpp)0
-rw-r--r--examples/charts/zoomlinechart/chart.h48
-rw-r--r--examples/charts/zoomlinechart/chartview.cpp (renamed from examples/zoomlinechart/chartview.cpp)0
-rw-r--r--examples/charts/zoomlinechart/chartview.h49
-rw-r--r--examples/charts/zoomlinechart/main.cpp62
-rw-r--r--examples/charts/zoomlinechart/zoomlinechart.pro (renamed from examples/zoomlinechart/zoomlinechart.pro)0
-rw-r--r--examples/customchart/main.cpp131
-rw-r--r--examples/datetimeaxis/main.cpp100
-rw-r--r--examples/donutbreakdown/donutbreakdownchart.cpp110
-rw-r--r--examples/donutbreakdown/donutbreakdownchart.h42
-rw-r--r--examples/donutbreakdown/main.cpp77
-rw-r--r--examples/donutbreakdown/mainslice.cpp57
-rw-r--r--examples/donutbreakdown/mainslice.h48
-rw-r--r--examples/donutchart/main.cpp62
-rw-r--r--examples/examples.pri33
-rw-r--r--examples/examples.pro45
-rw-r--r--examples/horizontalbarchart/main.cpp96
-rw-r--r--examples/horizontalpercentbarchart/main.cpp94
-rw-r--r--examples/horizontalstackedbarchart/main.cpp94
-rw-r--r--examples/legend/main.cpp37
-rw-r--r--examples/legend/mainwidget.cpp247
-rw-r--r--examples/legend/mainwidget.h78
-rw-r--r--examples/legendmarkers/mainwidget.cpp177
-rw-r--r--examples/legendmarkers/mainwidget.h62
-rw-r--r--examples/lineandbar/main.cpp111
-rw-r--r--examples/linechart/main.cpp67
-rw-r--r--examples/logvalueaxis/main.cpp75
-rw-r--r--examples/modeldata/tablewidget.cpp117
-rw-r--r--examples/multiaxis/main.cpp92
-rw-r--r--examples/percentbarchart/main.cpp93
-rw-r--r--examples/piechart/main.cpp70
-rw-r--r--examples/piechartdrilldown/drilldownchart.cpp54
-rw-r--r--examples/piechartdrilldown/drilldownchart.h47
-rw-r--r--examples/piechartdrilldown/drilldownslice.cpp63
-rw-r--r--examples/piechartdrilldown/drilldownslice.h49
-rw-r--r--examples/piechartdrilldown/main.cpp77
-rw-r--r--examples/polarchart/chartview.cpp111
-rw-r--r--examples/polarchart/chartview.h41
-rw-r--r--examples/polarchart/main.cpp137
-rw-r--r--examples/qmlboxplot/main.cpp43
-rw-r--r--examples/qmlboxplot/qml/qmlboxplot/main.qml40
-rw-r--r--examples/qmlboxplot/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--examples/qmlboxplot/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--examples/qmlboxplot/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--examples/qmlboxplot/qmlboxplot.pro11
-rw-r--r--examples/qmlpiechart/main.cpp43
-rw-r--r--examples/qmlpiechart/qml/qmlpiechart/main.qml53
-rw-r--r--examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--examples/qmlpiechart/qmlpiechart.pro9
-rw-r--r--examples/scatterchart/chartview.h35
-rw-r--r--examples/scatterchart/main.cpp40
-rw-r--r--examples/scatterinteractions/chartview.cpp79
-rw-r--r--examples/scatterinteractions/chartview.h46
-rw-r--r--examples/splinechart/main.cpp68
-rw-r--r--examples/stackedbarchart/main.cpp93
-rw-r--r--examples/stackedbarchartdrilldown/drilldownchart.cpp60
-rw-r--r--examples/stackedbarchartdrilldown/drilldownchart.h46
-rw-r--r--examples/stackedbarchartdrilldown/drilldownseries.cpp46
-rw-r--r--examples/stackedbarchartdrilldown/drilldownseries.h48
-rw-r--r--examples/stackedbarchartdrilldown/main.cpp113
-rw-r--r--examples/temperaturerecords/main.cpp88
-rw-r--r--examples/zoomlinechart/chart.h48
-rw-r--r--examples/zoomlinechart/chartview.h49
-rw-r--r--examples/zoomlinechart/main.cpp62
-rw-r--r--features/qtcommercialchart.prf9
-rw-r--r--plugins/declarative/declarative.pri60
-rw-r--r--plugins/declarative/declarativeareaseries.cpp115
-rw-r--r--plugins/declarative/declarativeareaseries.h94
-rw-r--r--plugins/declarative/declarativeaxes.cpp61
-rw-r--r--plugins/declarative/declarativeaxes.h72
-rw-r--r--plugins/declarative/declarativebarseries.cpp509
-rw-r--r--plugins/declarative/declarativebarseries.h415
-rw-r--r--plugins/declarative/declarativeboxplotseries.cpp401
-rw-r--r--plugins/declarative/declarativeboxplotseries.h154
-rw-r--r--plugins/declarative/declarativecategoryaxis.cpp107
-rw-r--r--plugins/declarative/declarativecategoryaxis.h87
-rw-r--r--plugins/declarative/declarativechart.cpp1080
-rw-r--r--plugins/declarative/declarativechart.h245
-rw-r--r--plugins/declarative/declarativelineseries.cpp104
-rw-r--r--plugins/declarative/declarativelineseries.h123
-rw-r--r--plugins/declarative/declarativemargins.cpp121
-rw-r--r--plugins/declarative/declarativemargins.h54
-rw-r--r--plugins/declarative/declarativepieseries.cpp154
-rw-r--r--plugins/declarative/declarativepieseries.h96
-rw-r--r--plugins/declarative/declarativepolarchart.cpp53
-rw-r--r--plugins/declarative/declarativepolarchart.h47
-rw-r--r--plugins/declarative/declarativescatterseries.cpp114
-rw-r--r--plugins/declarative/declarativescatterseries.h130
-rw-r--r--plugins/declarative/declarativesplineseries.cpp104
-rw-r--r--plugins/declarative/declarativesplineseries.h123
-rw-r--r--plugins/declarative/declarativexypoint.cpp60
-rw-r--r--plugins/declarative/declarativexypoint.h42
-rw-r--r--plugins/declarative/declarativexyseries.cpp118
-rw-r--r--plugins/declarative/declarativexyseries.h54
-rw-r--r--plugins/declarative/plugin.cpp332
-rw-r--r--plugins/declarative/shared_defines.h42
-rw-r--r--plugins/designer/designer.pro28
-rw-r--r--plugins/designer/qchartsplugin.cpp38
-rw-r--r--plugins/designer/qchartsplugin.h4
-rw-r--r--plugins/plugins.pri14
-rw-r--r--plugins/plugins.pro15
-rw-r--r--plugins/quick1/qmldir1
-rw-r--r--plugins/quick1/quick1.pro8
-rw-r--r--plugins/quick2/plugins.qmltypes2263
-rw-r--r--plugins/quick2/qmldir3
-rw-r--r--plugins/quick2/quick2.pro11
-rw-r--r--qtcharts.pro3
-rw-r--r--src/animations/axisanimation.cpp136
-rw-r--r--src/animations/axisanimation_p.h62
-rw-r--r--src/animations/baranimation.cpp82
-rw-r--r--src/animations/baranimation_p.h59
-rw-r--r--src/animations/boxplotanimation.cpp97
-rw-r--r--src/animations/boxplotanimation_p.h64
-rw-r--r--src/animations/boxwhiskersanimation.cpp110
-rw-r--r--src/animations/boxwhiskersanimation_p.h69
-rw-r--r--src/animations/chartanimation.cpp46
-rw-r--r--src/animations/chartanimation_p.h57
-rw-r--r--src/animations/pieanimation.cpp110
-rw-r--r--src/animations/pieanimation_p.h62
-rw-r--r--src/animations/piesliceanimation.cpp128
-rw-r--r--src/animations/piesliceanimation_p.h60
-rw-r--r--src/animations/scatteranimation.cpp50
-rw-r--r--src/animations/scatteranimation_p.h50
-rw-r--r--src/animations/splineanimation.cpp210
-rw-r--r--src/animations/splineanimation_p.h62
-rw-r--r--src/animations/xyanimation.cpp155
-rw-r--r--src/animations/xyanimation_p.h67
-rw-r--r--src/areachart/areachartitem.cpp262
-rw-r--r--src/areachart/areachartitem_p.h123
-rw-r--r--src/areachart/qareaseries.cpp655
-rw-r--r--src/areachart/qareaseries.h106
-rw-r--r--src/areachart/qareaseries_p.h76
-rw-r--r--src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp138
-rw-r--r--src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h62
-rw-r--r--src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp140
-rw-r--r--src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h61
-rw-r--r--src/axis/barcategoryaxis/qbarcategoryaxis.cpp612
-rw-r--r--src/axis/barcategoryaxis/qbarcategoryaxis.h81
-rw-r--r--src/axis/barcategoryaxis/qbarcategoryaxis_p.h81
-rw-r--r--src/axis/cartesianchartaxis.cpp198
-rw-r--r--src/axis/cartesianchartaxis_p.h79
-rw-r--r--src/axis/categoryaxis/chartcategoryaxisx.cpp117
-rw-r--r--src/axis/categoryaxis/chartcategoryaxisx_p.h61
-rw-r--r--src/axis/categoryaxis/chartcategoryaxisy.cpp117
-rw-r--r--src/axis/categoryaxis/chartcategoryaxisy_p.h61
-rw-r--r--src/axis/categoryaxis/polarchartcategoryaxisangular.cpp80
-rw-r--r--src/axis/categoryaxis/polarchartcategoryaxisangular_p.h56
-rw-r--r--src/axis/categoryaxis/polarchartcategoryaxisradial.cpp79
-rw-r--r--src/axis/categoryaxis/polarchartcategoryaxisradial_p.h56
-rw-r--r--src/axis/categoryaxis/qcategoryaxis.cpp342
-rw-r--r--src/axis/categoryaxis/qcategoryaxis.h70
-rw-r--r--src/axis/categoryaxis/qcategoryaxis_p.h62
-rw-r--r--src/axis/chartaxiselement.cpp402
-rw-r--r--src/axis/chartaxiselement_p.h155
-rw-r--r--src/axis/datetimeaxis/chartdatetimeaxisx.cpp131
-rw-r--r--src/axis/datetimeaxis/chartdatetimeaxisx_p.h60
-rw-r--r--src/axis/datetimeaxis/chartdatetimeaxisy.cpp132
-rw-r--r--src/axis/datetimeaxis/chartdatetimeaxisy_p.h60
-rw-r--r--src/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp80
-rw-r--r--src/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h56
-rw-r--r--src/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp79
-rw-r--r--src/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h56
-rw-r--r--src/axis/datetimeaxis/qdatetimeaxis.cpp393
-rw-r--r--src/axis/datetimeaxis/qdatetimeaxis.h78
-rw-r--r--src/axis/datetimeaxis/qdatetimeaxis_p.h73
-rw-r--r--src/axis/horizontalaxis.cpp225
-rw-r--r--src/axis/horizontalaxis_p.h50
-rw-r--r--src/axis/linearrowitem_p.h76
-rw-r--r--src/axis/logvalueaxis/chartlogvalueaxisx.cpp137
-rw-r--r--src/axis/logvalueaxis/chartlogvalueaxisx_p.h63
-rw-r--r--src/axis/logvalueaxis/chartlogvalueaxisy.cpp137
-rw-r--r--src/axis/logvalueaxis/chartlogvalueaxisy_p.h63
-rw-r--r--src/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp90
-rw-r--r--src/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h57
-rw-r--r--src/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp95
-rw-r--r--src/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h57
-rw-r--r--src/axis/logvalueaxis/qlogvalueaxis.cpp402
-rw-r--r--src/axis/logvalueaxis/qlogvalueaxis.h77
-rw-r--r--src/axis/logvalueaxis/qlogvalueaxis_p.h69
-rw-r--r--src/axis/polarchartaxis.cpp126
-rw-r--r--src/axis/polarchartaxis_p.h70
-rw-r--r--src/axis/polarchartaxisangular.cpp432
-rw-r--r--src/axis/polarchartaxisangular_p.h63
-rw-r--r--src/axis/polarchartaxisradial.cpp297
-rw-r--r--src/axis/polarchartaxisradial_p.h60
-rw-r--r--src/axis/qabstractaxis.cpp1015
-rw-r--r--src/axis/qabstractaxis.h193
-rw-r--r--src/axis/qabstractaxis_p.h130
-rw-r--r--src/axis/valueaxis/chartvalueaxisx.cpp128
-rw-r--r--src/axis/valueaxis/chartvalueaxisx_p.h60
-rw-r--r--src/axis/valueaxis/chartvalueaxisy.cpp128
-rw-r--r--src/axis/valueaxis/chartvalueaxisy_p.h60
-rw-r--r--src/axis/valueaxis/polarchartvalueaxisangular.cpp80
-rw-r--r--src/axis/valueaxis/polarchartvalueaxisangular_p.h56
-rw-r--r--src/axis/valueaxis/polarchartvalueaxisradial.cpp79
-rw-r--r--src/axis/valueaxis/polarchartvalueaxisradial_p.h56
-rw-r--r--src/axis/valueaxis/qvalueaxis.cpp451
-rw-r--r--src/axis/valueaxis/qvalueaxis.h83
-rw-r--r--src/axis/valueaxis/qvalueaxis_p.h70
-rw-r--r--src/axis/verticalaxis.cpp229
-rw-r--r--src/axis/verticalaxis_p.h50
-rw-r--r--src/barchart/abstractbarchartitem.cpp268
-rw-r--r--src/barchart/abstractbarchartitem_p.h96
-rw-r--r--src/barchart/bar.cpp71
-rw-r--r--src/barchart/bar_p.h66
-rw-r--r--src/barchart/horizontal/bar/horizontalbarchartitem.cpp94
-rw-r--r--src/barchart/horizontal/bar/horizontalbarchartitem_p.h51
-rw-r--r--src/barchart/horizontal/bar/qhorizontalbarseries.cpp125
-rw-r--r--src/barchart/horizontal/bar/qhorizontalbarseries.h45
-rw-r--r--src/barchart/horizontal/bar/qhorizontalbarseries_p.h50
-rw-r--r--src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp140
-rw-r--r--src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h52
-rw-r--r--src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp124
-rw-r--r--src/barchart/horizontal/percent/qhorizontalpercentbarseries.h45
-rw-r--r--src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h50
-rw-r--r--src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp107
-rw-r--r--src/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h51
-rw-r--r--src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp120
-rw-r--r--src/barchart/horizontal/stacked/qhorizontalstackedbarseries.h45
-rw-r--r--src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h50
-rw-r--r--src/barchart/qabstractbarseries.cpp1028
-rw-r--r--src/barchart/qabstractbarseries.h105
-rw-r--r--src/barchart/qabstractbarseries_p.h118
-rw-r--r--src/barchart/qbarmodelmapper.cpp561
-rw-r--r--src/barchart/qbarmodelmapper.h69
-rw-r--r--src/barchart/qbarmodelmapper_p.h96
-rw-r--r--src/barchart/qbarset.cpp678
-rw-r--r--src/barchart/qbarset.h120
-rw-r--r--src/barchart/qbarset_p.h82
-rw-r--r--src/barchart/qhbarmodelmapper.cpp248
-rw-r--r--src/barchart/qhbarmodelmapper.h70
-rw-r--r--src/barchart/qvbarmodelmapper.cpp246
-rw-r--r--src/barchart/qvbarmodelmapper.h70
-rw-r--r--src/barchart/vertical/bar/barchartitem.cpp125
-rw-r--r--src/barchart/vertical/bar/barchartitem_p.h57
-rw-r--r--src/barchart/vertical/bar/qbarseries.cpp124
-rw-r--r--src/barchart/vertical/bar/qbarseries.h45
-rw-r--r--src/barchart/vertical/bar/qbarseries_p.h52
-rw-r--r--src/barchart/vertical/percent/percentbarchartitem.cpp171
-rw-r--r--src/barchart/vertical/percent/percentbarchartitem_p.h59
-rw-r--r--src/barchart/vertical/percent/qpercentbarseries.cpp125
-rw-r--r--src/barchart/vertical/percent/qpercentbarseries.h46
-rw-r--r--src/barchart/vertical/percent/qpercentbarseries_p.h51
-rw-r--r--src/barchart/vertical/stacked/qstackedbarseries.cpp122
-rw-r--r--src/barchart/vertical/stacked/qstackedbarseries.h46
-rw-r--r--src/barchart/vertical/stacked/qstackedbarseries_p.h51
-rw-r--r--src/barchart/vertical/stacked/stackedbarchartitem.cpp137
-rw-r--r--src/barchart/vertical/stacked/stackedbarchartitem_p.h58
-rw-r--r--src/boxplotchart/boxplotchartitem.cpp215
-rw-r--r--src/boxplotchart/boxplotchartitem_p.h84
-rw-r--r--src/boxplotchart/boxwhiskers.cpp194
-rw-r--r--src/boxplotchart/boxwhiskers_p.h102
-rw-r--r--src/boxplotchart/boxwhiskersdata_p.h80
-rw-r--r--src/boxplotchart/qboxplotmodelmapper.cpp489
-rw-r--r--src/boxplotchart/qboxplotmodelmapper.h69
-rw-r--r--src/boxplotchart/qboxplotmodelmapper_p.h93
-rw-r--r--src/boxplotchart/qboxplotseries.cpp690
-rw-r--r--src/boxplotchart/qboxplotseries.h85
-rw-r--r--src/boxplotchart/qboxplotseries_p.h100
-rw-r--r--src/boxplotchart/qboxset.cpp336
-rw-r--r--src/boxplotchart/qboxset.h94
-rw-r--r--src/boxplotchart/qboxset_p.h84
-rw-r--r--src/boxplotchart/qvboxplotmodelmapper.cpp246
-rw-r--r--src/boxplotchart/qvboxplotmodelmapper.h70
-rw-r--r--src/chartbackground.cpp99
-rw-r--r--src/chartbackground_p.h62
-rw-r--r--src/chartconfig_p.h91
-rw-r--r--src/chartdataset.cpp639
-rw-r--r--src/chartdataset_p.h94
-rw-r--r--src/chartelement.cpp55
-rw-r--r--src/chartelement_p.h65
-rw-r--r--src/chartitem.cpp47
-rw-r--r--src/chartitem_p.h57
-rw-r--r--src/chartpresenter.cpp509
-rw-r--r--src/chartpresenter_p.h192
-rw-r--r--src/charts/animations/animations.pri (renamed from src/animations/animations.pri)0
-rw-r--r--src/charts/animations/axisanimation.cpp135
-rw-r--r--src/charts/animations/axisanimation_p.h62
-rw-r--r--src/charts/animations/baranimation.cpp82
-rw-r--r--src/charts/animations/baranimation_p.h59
-rw-r--r--src/charts/animations/boxplotanimation.cpp97
-rw-r--r--src/charts/animations/boxplotanimation_p.h64
-rw-r--r--src/charts/animations/boxwhiskersanimation.cpp110
-rw-r--r--src/charts/animations/boxwhiskersanimation_p.h69
-rw-r--r--src/charts/animations/chartanimation.cpp46
-rw-r--r--src/charts/animations/chartanimation_p.h57
-rw-r--r--src/charts/animations/pieanimation.cpp110
-rw-r--r--src/charts/animations/pieanimation_p.h62
-rw-r--r--src/charts/animations/piesliceanimation.cpp128
-rw-r--r--src/charts/animations/piesliceanimation_p.h60
-rw-r--r--src/charts/animations/scatteranimation.cpp50
-rw-r--r--src/charts/animations/scatteranimation_p.h50
-rw-r--r--src/charts/animations/splineanimation.cpp210
-rw-r--r--src/charts/animations/splineanimation_p.h62
-rw-r--r--src/charts/animations/xyanimation.cpp155
-rw-r--r--src/charts/animations/xyanimation_p.h67
-rw-r--r--src/charts/areachart/areachart.pri (renamed from src/areachart/areachart.pri)0
-rw-r--r--src/charts/areachart/areachartitem.cpp262
-rw-r--r--src/charts/areachart/areachartitem_p.h123
-rw-r--r--src/charts/areachart/qareaseries.cpp657
-rw-r--r--src/charts/areachart/qareaseries.h106
-rw-r--r--src/charts/areachart/qareaseries_p.h76
-rw-r--r--src/charts/axis/axis.pri (renamed from src/axis/axis.pri)0
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp140
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h62
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp142
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h61
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp620
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis.h81
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h81
-rw-r--r--src/charts/axis/cartesianchartaxis.cpp198
-rw-r--r--src/charts/axis/cartesianchartaxis_p.h79
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisx.cpp119
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisx_p.h61
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisy.cpp119
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisy_p.h61
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp80
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h56
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp79
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h56
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis.cpp345
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis.h70
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis_p.h62
-rw-r--r--src/charts/axis/chartaxiselement.cpp404
-rw-r--r--src/charts/axis/chartaxiselement_p.h155
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp133
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h60
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp134
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h60
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp80
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h56
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp79
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h56
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis.cpp390
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis.h78
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis_p.h73
-rw-r--r--src/charts/axis/horizontalaxis.cpp227
-rw-r--r--src/charts/axis/horizontalaxis_p.h50
-rw-r--r--src/charts/axis/linearrowitem_p.h76
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp139
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h63
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp139
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h63
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp90
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h57
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp95
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h57
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis.cpp400
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis.h77
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis_p.h69
-rw-r--r--src/charts/axis/polarchartaxis.cpp126
-rw-r--r--src/charts/axis/polarchartaxis_p.h70
-rw-r--r--src/charts/axis/polarchartaxisangular.cpp433
-rw-r--r--src/charts/axis/polarchartaxisangular_p.h63
-rw-r--r--src/charts/axis/polarchartaxisradial.cpp297
-rw-r--r--src/charts/axis/polarchartaxisradial_p.h60
-rw-r--r--src/charts/axis/qabstractaxis.cpp1012
-rw-r--r--src/charts/axis/qabstractaxis.h193
-rw-r--r--src/charts/axis/qabstractaxis_p.h130
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisx.cpp130
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisx_p.h60
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisy.cpp130
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisy_p.h60
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp80
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h56
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp79
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h56
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis.cpp459
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis.h83
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis_p.h70
-rw-r--r--src/charts/axis/verticalaxis.cpp231
-rw-r--r--src/charts/axis/verticalaxis_p.h50
-rw-r--r--src/charts/barchart/abstractbarchartitem.cpp268
-rw-r--r--src/charts/barchart/abstractbarchartitem_p.h96
-rw-r--r--src/charts/barchart/bar.cpp71
-rw-r--r--src/charts/barchart/bar_p.h66
-rw-r--r--src/charts/barchart/barchart.pri (renamed from src/barchart/barchart.pri)0
-rw-r--r--src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp94
-rw-r--r--src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h51
-rw-r--r--src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp126
-rw-r--r--src/charts/barchart/horizontal/bar/qhorizontalbarseries.h45
-rw-r--r--src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h50
-rw-r--r--src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp140
-rw-r--r--src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h52
-rw-r--r--src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp125
-rw-r--r--src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h45
-rw-r--r--src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h50
-rw-r--r--src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp107
-rw-r--r--src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h51
-rw-r--r--src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp121
-rw-r--r--src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h45
-rw-r--r--src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h50
-rw-r--r--src/charts/barchart/qabstractbarseries.cpp1030
-rw-r--r--src/charts/barchart/qabstractbarseries.h105
-rw-r--r--src/charts/barchart/qabstractbarseries_p.h118
-rw-r--r--src/charts/barchart/qbarmodelmapper.cpp561
-rw-r--r--src/charts/barchart/qbarmodelmapper.h69
-rw-r--r--src/charts/barchart/qbarmodelmapper_p.h96
-rw-r--r--src/charts/barchart/qbarset.cpp676
-rw-r--r--src/charts/barchart/qbarset.h120
-rw-r--r--src/charts/barchart/qbarset_p.h82
-rw-r--r--src/charts/barchart/qhbarmodelmapper.cpp258
-rw-r--r--src/charts/barchart/qhbarmodelmapper.h70
-rw-r--r--src/charts/barchart/qvbarmodelmapper.cpp258
-rw-r--r--src/charts/barchart/qvbarmodelmapper.h70
-rw-r--r--src/charts/barchart/vertical/bar/barchartitem.cpp125
-rw-r--r--src/charts/barchart/vertical/bar/barchartitem_p.h57
-rw-r--r--src/charts/barchart/vertical/bar/qbarseries.cpp125
-rw-r--r--src/charts/barchart/vertical/bar/qbarseries.h45
-rw-r--r--src/charts/barchart/vertical/bar/qbarseries_p.h52
-rw-r--r--src/charts/barchart/vertical/percent/percentbarchartitem.cpp171
-rw-r--r--src/charts/barchart/vertical/percent/percentbarchartitem_p.h59
-rw-r--r--src/charts/barchart/vertical/percent/qpercentbarseries.cpp126
-rw-r--r--src/charts/barchart/vertical/percent/qpercentbarseries.h46
-rw-r--r--src/charts/barchart/vertical/percent/qpercentbarseries_p.h51
-rw-r--r--src/charts/barchart/vertical/stacked/qstackedbarseries.cpp123
-rw-r--r--src/charts/barchart/vertical/stacked/qstackedbarseries.h46
-rw-r--r--src/charts/barchart/vertical/stacked/qstackedbarseries_p.h51
-rw-r--r--src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp137
-rw-r--r--src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h58
-rw-r--r--src/charts/boxplotchart/boxplotchart.pri (renamed from src/boxplotchart/boxplotchart.pri)0
-rw-r--r--src/charts/boxplotchart/boxplotchartitem.cpp215
-rw-r--r--src/charts/boxplotchart/boxplotchartitem_p.h84
-rw-r--r--src/charts/boxplotchart/boxwhiskers.cpp194
-rw-r--r--src/charts/boxplotchart/boxwhiskers_p.h102
-rw-r--r--src/charts/boxplotchart/boxwhiskersdata_p.h80
-rw-r--r--src/charts/boxplotchart/qboxplotmodelmapper.cpp489
-rw-r--r--src/charts/boxplotchart/qboxplotmodelmapper.h69
-rw-r--r--src/charts/boxplotchart/qboxplotmodelmapper_p.h93
-rw-r--r--src/charts/boxplotchart/qboxplotseries.cpp690
-rw-r--r--src/charts/boxplotchart/qboxplotseries.h85
-rw-r--r--src/charts/boxplotchart/qboxplotseries_p.h100
-rw-r--r--src/charts/boxplotchart/qboxset.cpp336
-rw-r--r--src/charts/boxplotchart/qboxset.h94
-rw-r--r--src/charts/boxplotchart/qboxset_p.h84
-rw-r--r--src/charts/boxplotchart/qvboxplotmodelmapper.cpp257
-rw-r--r--src/charts/boxplotchart/qvboxplotmodelmapper.h70
-rw-r--r--src/charts/chartbackground.cpp91
-rw-r--r--src/charts/chartbackground_p.h62
-rw-r--r--src/charts/chartconfig_p.h60
-rw-r--r--src/charts/chartdataset.cpp639
-rw-r--r--src/charts/chartdataset_p.h94
-rw-r--r--src/charts/chartelement.cpp55
-rw-r--r--src/charts/chartelement_p.h65
-rw-r--r--src/charts/charthelpers_p.h (renamed from src/charthelpers_p.h)0
-rw-r--r--src/charts/chartitem.cpp47
-rw-r--r--src/charts/chartitem_p.h57
-rw-r--r--src/charts/chartpresenter.cpp508
-rw-r--r--src/charts/chartpresenter_p.h192
-rw-r--r--src/charts/charts.pro82
-rw-r--r--src/charts/chartsnamespace.h28
-rw-r--r--src/charts/chartthememanager.cpp249
-rw-r--r--src/charts/chartthememanager_p.h84
-rw-r--r--src/charts/charttitle.cpp91
-rw-r--r--src/charts/charttitle_p.h53
-rw-r--r--src/charts/common.pri15
-rw-r--r--src/charts/doc/images/api_category_axis.png (renamed from doc/images/api_category_axis.png)bin6793 -> 6793 bytes
-rw-r--r--src/charts/doc/images/api_datatime_axis.png (renamed from doc/images/api_datatime_axis.png)bin78372 -> 78372 bytes
-rw-r--r--src/charts/doc/images/arrow_down.png (renamed from doc/images/arrow_down.png)bin177 -> 177 bytes
-rw-r--r--src/charts/doc/images/bg.png (renamed from doc/images/bg.png)bin372 -> 372 bytes
-rw-r--r--src/charts/doc/images/breadcrumb.png (renamed from doc/images/breadcrumb.png)bin134 -> 134 bytes
-rw-r--r--src/charts/doc/images/bullet_dn.png (renamed from doc/images/bullet_dn.png)bin230 -> 230 bytes
-rw-r--r--src/charts/doc/images/bullet_gt.png (renamed from doc/images/bullet_gt.png)bin124 -> 124 bytes
-rw-r--r--src/charts/doc/images/bullet_sq.png (renamed from doc/images/bullet_sq.png)bin74 -> 74 bytes
-rw-r--r--src/charts/doc/images/bullet_up.png (renamed from doc/images/bullet_up.png)bin210 -> 210 bytes
-rw-r--r--src/charts/doc/images/digia_logo.png (renamed from doc/images/digia_logo.png)bin690 -> 690 bytes
-rw-r--r--src/charts/doc/images/examples_areachart.png (renamed from doc/images/examples_areachart.png)bin41332 -> 41332 bytes
-rw-r--r--src/charts/doc/images/examples_audio.png (renamed from doc/images/demos_audio.png)bin49452 -> 49452 bytes
-rw-r--r--src/charts/doc/images/examples_barchart.png (renamed from doc/images/examples_barchart.png)bin31448 -> 31448 bytes
-rw-r--r--src/charts/doc/images/examples_barmodelmapper.png (renamed from doc/images/examples_barmodelmapper.png)bin91629 -> 91629 bytes
-rw-r--r--src/charts/doc/images/examples_boxplotchart.png (renamed from doc/images/examples_boxplotchart.png)bin69135 -> 69135 bytes
-rw-r--r--src/charts/doc/images/examples_callout.png (renamed from doc/images/demos_callout.png)bin79984 -> 79984 bytes
-rw-r--r--src/charts/doc/images/examples_chartthemes_blue_cerulean.png (renamed from doc/images/demo_chartthemes_blue_cerulean.png)bin129218 -> 129218 bytes
-rw-r--r--src/charts/doc/images/examples_chartthemes_brown_sand.png (renamed from doc/images/demo_chartthemes_brown_sand.png)bin112797 -> 112797 bytes
-rw-r--r--src/charts/doc/images/examples_chartthemes_light.png (renamed from doc/images/demo_chartthemes_light.png)bin108482 -> 108482 bytes
-rw-r--r--src/charts/doc/images/examples_customchart.png (renamed from doc/images/examples_customchart.png)bin30554 -> 30554 bytes
-rw-r--r--src/charts/doc/images/examples_datetimeaxis.png (renamed from doc/images/examples_datetimeaxis.png)bin75267 -> 75267 bytes
-rw-r--r--src/charts/doc/images/examples_donutbreakdown.png (renamed from doc/images/examples_donutbreakdown.png)bin92062 -> 92062 bytes
-rw-r--r--src/charts/doc/images/examples_donutchart.png (renamed from doc/images/examples_donutchart.png)bin47040 -> 47040 bytes
-rw-r--r--src/charts/doc/images/examples_dynamicspline1.png (renamed from doc/images/demos_dynamicspline1.png)bin34292 -> 34292 bytes
-rw-r--r--src/charts/doc/images/examples_dynamicspline2.png (renamed from doc/images/demos_dynamicspline2.png)bin40347 -> 40347 bytes
-rw-r--r--src/charts/doc/images/examples_horizontalbarchart.png (renamed from doc/images/examples_horizontalbarchart.png)bin42261 -> 42261 bytes
-rw-r--r--src/charts/doc/images/examples_horizontalpercentbarchart.png (renamed from doc/images/examples_horizontalpercentbarchart.png)bin39993 -> 39993 bytes
-rw-r--r--src/charts/doc/images/examples_horizontalstackedbarchart.png (renamed from doc/images/examples_horizontalstackedbarchart.png)bin40940 -> 40940 bytes
-rw-r--r--src/charts/doc/images/examples_legend_detach.png (renamed from doc/images/examples_legend_detach.png)bin61273 -> 61273 bytes
-rw-r--r--src/charts/doc/images/examples_legend_detach2.png (renamed from doc/images/examples_legend_detach2.png)bin75296 -> 75296 bytes
-rw-r--r--src/charts/doc/images/examples_legendmarkers.png (renamed from doc/images/examples_legendmarkers.png)bin65162 -> 65162 bytes
-rw-r--r--src/charts/doc/images/examples_lineandbar.png (renamed from doc/images/examples_lineandbar.png)bin48731 -> 48731 bytes
-rw-r--r--src/charts/doc/images/examples_linechart.png (renamed from doc/images/examples_linechart.png)bin41188 -> 41188 bytes
-rw-r--r--src/charts/doc/images/examples_logvalueaxis.png (renamed from doc/images/examples_logvalueaxis.png)bin43823 -> 43823 bytes
-rw-r--r--src/charts/doc/images/examples_modeldata.png (renamed from doc/images/examples_modeldata.png)bin122670 -> 122670 bytes
-rw-r--r--src/charts/doc/images/examples_multiaxis.png (renamed from doc/images/examples_multiaxis.png)bin91649 -> 91649 bytes
-rw-r--r--src/charts/doc/images/examples_nesteddonuts.png (renamed from doc/images/demos_nesteddonuts.png)bin99909 -> 99909 bytes
-rw-r--r--src/charts/doc/images/examples_percentbarchart.png (renamed from doc/images/examples_percentbarchart.png)bin41041 -> 41041 bytes
-rw-r--r--src/charts/doc/images/examples_percentbarchart_legend.png (renamed from doc/images/examples_percentbarchart_legend.png)bin66859 -> 66859 bytes
-rw-r--r--src/charts/doc/images/examples_piechart.png (renamed from doc/images/examples_piechart.png)bin37613 -> 37613 bytes
-rw-r--r--src/charts/doc/images/examples_piechartdrill1.png (renamed from doc/images/examples_piechartdrill1.png)bin48580 -> 48580 bytes
-rw-r--r--src/charts/doc/images/examples_piechartdrill2.png (renamed from doc/images/examples_piechartdrill2.png)bin59468 -> 59468 bytes
-rw-r--r--src/charts/doc/images/examples_polarchart.png (renamed from doc/images/examples_polarchart.png)bin144425 -> 144425 bytes
-rw-r--r--src/charts/doc/images/examples_qmlaxes1.png (renamed from doc/images/demos_qmlaxes1.png)bin43753 -> 43753 bytes
-rw-r--r--src/charts/doc/images/examples_qmlaxes2.png (renamed from doc/images/demos_qmlaxes2.png)bin40033 -> 40033 bytes
-rw-r--r--src/charts/doc/images/examples_qmlaxes3.png (renamed from doc/images/demos_qmlaxes3.png)bin35051 -> 35051 bytes
-rw-r--r--src/charts/doc/images/examples_qmlboxplot.png (renamed from doc/images/examples_qmlboxplot.png)bin38202 -> 38202 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart1.png (renamed from doc/images/demos_qmlchart1.png)bin41391 -> 41391 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart10.png (renamed from doc/images/demos_qmlchart10.png)bin38626 -> 38626 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart11.png (renamed from doc/images/demos_qmlchart11.png)bin37772 -> 37772 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart12.png (renamed from doc/images/demos_qmlchart12.png)bin74409 -> 74409 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart2.png (renamed from doc/images/demos_qmlchart2.png)bin37390 -> 37390 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart3.png (renamed from doc/images/demos_qmlchart3.png)bin39135 -> 39135 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart4.png (renamed from doc/images/demos_qmlchart4.png)bin51563 -> 51563 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart5.png (renamed from doc/images/demos_qmlchart5.png)bin37997 -> 37997 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart6.png (renamed from doc/images/demos_qmlchart6.png)bin20283 -> 20283 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart7.png (renamed from doc/images/demos_qmlchart7.png)bin37926 -> 37926 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart8.png (renamed from doc/images/demos_qmlchart8.png)bin37293 -> 37293 bytes
-rw-r--r--src/charts/doc/images/examples_qmlchart9.png (renamed from doc/images/demos_qmlchart9.png)bin37972 -> 37972 bytes
-rw-r--r--src/charts/doc/images/examples_qmlcustomizations.png (renamed from doc/images/demos_qmlcustomizations.png)bin38735 -> 38735 bytes
-rw-r--r--src/charts/doc/images/examples_qmlcustomlegend1.png (renamed from doc/images/demos-qmlcustomlegend1.png)bin53458 -> 53458 bytes
-rw-r--r--src/charts/doc/images/examples_qmlcustomlegend2.png (renamed from doc/images/demos-qmlcustomlegend2.png)bin55307 -> 55307 bytes
-rw-r--r--src/charts/doc/images/examples_qmlcustomlegend3.png (renamed from doc/images/demos-qmlcustomlegend3.png)bin43897 -> 43897 bytes
-rw-r--r--src/charts/doc/images/examples_qmlcustommodel.png (renamed from doc/images/demos_qmlcustommodel.png)bin49142 -> 49142 bytes
-rw-r--r--src/charts/doc/images/examples_qmlf1legends.png (renamed from doc/images/demos_qmlf1legends.png)bin48312 -> 48312 bytes
-rw-r--r--src/charts/doc/images/examples_qmloscilloscope.png (renamed from doc/images/demos_qmloscilloscope.png)bin56377 -> 56377 bytes
-rw-r--r--src/charts/doc/images/examples_qmlpiechart.png (renamed from doc/images/examples_qmlpiechart.png)bin32704 -> 32704 bytes
-rw-r--r--src/charts/doc/images/examples_qmlpolarchart1.png (renamed from doc/images/demos_qmlpolarchart1.png)bin95929 -> 95929 bytes
-rw-r--r--src/charts/doc/images/examples_qmlpolarchart2.png (renamed from doc/images/demos_qmlpolarchart2.png)bin108429 -> 108429 bytes
-rw-r--r--src/charts/doc/images/examples_qmlpolarchart3.png (renamed from doc/images/demos_qmlpolarchart3.png)bin90823 -> 90823 bytes
-rw-r--r--src/charts/doc/images/examples_qmlweather.png (renamed from doc/images/demos_qmlweather.png)bin64793 -> 64793 bytes
-rw-r--r--src/charts/doc/images/examples_scatterchart.png (renamed from doc/images/examples_scatterchart.png)bin30702 -> 30702 bytes
-rw-r--r--src/charts/doc/images/examples_scatterinteractions.png (renamed from doc/images/examples_scatterinteractions.png)bin41609 -> 41609 bytes
-rw-r--r--src/charts/doc/images/examples_splinechart.png (renamed from doc/images/examples_splinechart.png)bin41052 -> 41052 bytes
-rw-r--r--src/charts/doc/images/examples_stackedbarchart.png (renamed from doc/images/examples_stackedbarchart.png)bin40699 -> 40699 bytes
-rw-r--r--src/charts/doc/images/examples_stackedbarchartdrilldown1.png (renamed from doc/images/examples_stackedbarchartdrilldown1.png)bin39237 -> 39237 bytes
-rw-r--r--src/charts/doc/images/examples_stackedbarchartdrilldown2.png (renamed from doc/images/examples_stackedbarchartdrilldown2.png)bin37845 -> 37845 bytes
-rw-r--r--src/charts/doc/images/examples_temperaturerecords.png (renamed from doc/images/examples_temperaturerecords.png)bin38760 -> 38760 bytes
-rw-r--r--src/charts/doc/images/examples_zoomlinechart1.png (renamed from doc/images/examples_zoomlinechart1.png)bin50892 -> 50892 bytes
-rw-r--r--src/charts/doc/images/examples_zoomlinechart2.png (renamed from doc/images/examples_zoomlinechart2.png)bin40448 -> 40448 bytes
-rw-r--r--src/charts/doc/images/horBar.png (renamed from doc/images/horBar.png)bin2807 -> 2807 bytes
-rw-r--r--src/charts/doc/images/piechart_customization.png (renamed from doc/images/piechart_customization.png)bin132696 -> 132696 bytes
-rw-r--r--src/charts/doc/images/qcharts.png (renamed from doc/images/qcharts.png)bin5582 -> 5582 bytes
-rw-r--r--src/charts/doc/images/qt-logo.png (renamed from doc/images/qt-logo.png)bin5149 -> 5149 bytes
-rw-r--r--src/charts/doc/qtcharts.qdocconf66
-rw-r--r--src/charts/doc/snippets/doc_src_qmlcharts.cpp21
-rw-r--r--src/charts/doc/snippets/doc_src_qtcharts.cpp35
-rw-r--r--src/charts/doc/snippets/doc_src_qtcharts.pro21
-rw-r--r--src/charts/doc/src/examples-areachart.qdoc30
-rw-r--r--src/charts/doc/src/examples-audio.qdoc8
-rw-r--r--src/charts/doc/src/examples-barchart.qdoc47
-rw-r--r--src/charts/doc/src/examples-barmodelmapper.qdoc58
-rw-r--r--src/charts/doc/src/examples-boxplotchart.qdoc78
-rw-r--r--src/charts/doc/src/examples-callout.qdoc15
-rw-r--r--src/charts/doc/src/examples-chartthemes.qdoc15
-rw-r--r--src/charts/doc/src/examples-customchart.qdoc26
-rw-r--r--src/charts/doc/src/examples-datetimeaxis.qdoc38
-rw-r--r--src/charts/doc/src/examples-donutbreakdown.qdoc45
-rw-r--r--src/charts/doc/src/examples-donutchart.qdoc9
-rw-r--r--src/charts/doc/src/examples-dynamicspline.qdoc10
-rw-r--r--src/charts/doc/src/examples-horizontalbarchart.qdoc50
-rw-r--r--src/charts/doc/src/examples-horizontalpercentbarchart.qdoc56
-rw-r--r--src/charts/doc/src/examples-horizontalstackedbarchart.qdoc53
-rw-r--r--src/charts/doc/src/examples-legend.qdoc40
-rw-r--r--src/charts/doc/src/examples-legendmarkers.qdoc43
-rw-r--r--src/charts/doc/src/examples-lineandbarchart.qdoc48
-rw-r--r--src/charts/doc/src/examples-linechart.qdoc30
-rw-r--r--src/charts/doc/src/examples-logvalueaxis.qdoc30
-rw-r--r--src/charts/doc/src/examples-modeldata.qdoc59
-rw-r--r--src/charts/doc/src/examples-multiaxis.qdoc37
-rw-r--r--src/charts/doc/src/examples-nesteddonuts.qdoc50
-rw-r--r--src/charts/doc/src/examples-percentbarchart.qdoc55
-rw-r--r--src/charts/doc/src/examples-piechart.qdoc9
-rw-r--r--src/charts/doc/src/examples-piechartcustomization.qdoc8
-rw-r--r--src/charts/doc/src/examples-piechartdrilldown.qdoc9
-rw-r--r--src/charts/doc/src/examples-polarchart.qdoc34
-rw-r--r--src/charts/doc/src/examples-qmlaxes.qdoc32
-rw-r--r--src/charts/doc/src/examples-qmlchart.qdoc125
-rw-r--r--src/charts/doc/src/examples-qmlcustomizations.qdoc28
-rw-r--r--src/charts/doc/src/examples-qmlcustomlegend.qdoc43
-rw-r--r--src/charts/doc/src/examples-qmlf1legends.qdoc23
-rw-r--r--src/charts/doc/src/examples-qmloscilloscope.qdoc47
-rw-r--r--src/charts/doc/src/examples-qmlpolarchart.qdoc35
-rw-r--r--src/charts/doc/src/examples-qmlweather.qdoc34
-rw-r--r--src/charts/doc/src/examples-scatterchart.qdoc39
-rw-r--r--src/charts/doc/src/examples-scatterinteractions.qdoc10
-rw-r--r--src/charts/doc/src/examples-splinechart.qdoc34
-rw-r--r--src/charts/doc/src/examples-stackedbarchart.qdoc53
-rw-r--r--src/charts/doc/src/examples-stackedbarchartdrilldown.qdoc50
-rw-r--r--src/charts/doc/src/examples-temperaturerecords.qdoc46
-rw-r--r--src/charts/doc/src/examples-zoomlinechart.qdoc33
-rw-r--r--src/charts/doc/src/index.qdoc61
-rw-r--r--src/charts/doc/src/qtcharts.qdoc200
-rw-r--r--src/charts/doc/style/offline.css (renamed from doc/style/offline.css)0
-rw-r--r--src/charts/domain/abstractdomain.cpp265
-rw-r--r--src/charts/domain/abstractdomain_p.h132
-rw-r--r--src/charts/domain/domain.pri (renamed from src/domain/domain.pri)0
-rw-r--r--src/charts/domain/logxlogydomain.cpp278
-rw-r--r--src/charts/domain/logxlogydomain_p.h79
-rw-r--r--src/charts/domain/logxlogypolardomain.cpp273
-rw-r--r--src/charts/domain/logxlogypolardomain_p.h81
-rw-r--r--src/charts/domain/logxydomain.cpp245
-rw-r--r--src/charts/domain/logxydomain_p.h75
-rw-r--r--src/charts/domain/logxypolardomain.cpp242
-rw-r--r--src/charts/domain/logxypolardomain_p.h77
-rw-r--r--src/charts/domain/polardomain.cpp91
-rw-r--r--src/charts/domain/polardomain_p.h62
-rw-r--r--src/charts/domain/xlogydomain.cpp241
-rw-r--r--src/charts/domain/xlogydomain_p.h75
-rw-r--r--src/charts/domain/xlogypolardomain.cpp237
-rw-r--r--src/charts/domain/xlogypolardomain_p.h77
-rw-r--r--src/charts/domain/xydomain.cpp186
-rw-r--r--src/charts/domain/xydomain_p.h64
-rw-r--r--src/charts/domain/xypolardomain.cpp184
-rw-r--r--src/charts/domain/xypolardomain_p.h65
-rw-r--r--src/charts/layout/abstractchartlayout.cpp203
-rw-r--r--src/charts/layout/abstractchartlayout_p.h82
-rw-r--r--src/charts/layout/cartesianchartlayout.cpp246
-rw-r--r--src/charts/layout/cartesianchartlayout_p.h50
-rw-r--r--src/charts/layout/layout.pri (renamed from src/layout/layout.pri)0
-rw-r--r--src/charts/layout/polarchartlayout.cpp82
-rw-r--r--src/charts/layout/polarchartlayout_p.h50
-rw-r--r--src/charts/legend/legend.pri (renamed from src/legend/legend.pri)0
-rw-r--r--src/charts/legend/legendlayout.cpp506
-rw-r--r--src/charts/legend/legendlayout_p.h84
-rw-r--r--src/charts/legend/legendmarkeritem.cpp192
-rw-r--r--src/charts/legend/legendmarkeritem_p.h101
-rw-r--r--src/charts/legend/legendscroller.cpp74
-rw-r--r--src/charts/legend/legendscroller_p.h57
-rw-r--r--src/charts/legend/qarealegendmarker.cpp126
-rw-r--r--src/charts/legend/qarealegendmarker.h56
-rw-r--r--src/charts/legend/qarealegendmarker_p.h64
-rw-r--r--src/charts/legend/qbarlegendmarker.cpp146
-rw-r--r--src/charts/legend/qbarlegendmarker.h57
-rw-r--r--src/charts/legend/qbarlegendmarker_p.h66
-rw-r--r--src/charts/legend/qboxplotlegendmarker.cpp127
-rw-r--r--src/charts/legend/qboxplotlegendmarker.h55
-rw-r--r--src/charts/legend/qboxplotlegendmarker_p.h64
-rw-r--r--src/charts/legend/qlegend.cpp632
-rw-r--r--src/charts/legend/qlegend.h112
-rw-r--r--src/charts/legend/qlegend_p.h101
-rw-r--r--src/charts/legend/qlegendmarker.cpp294
-rw-r--r--src/charts/legend/qlegendmarker.h105
-rw-r--r--src/charts/legend/qlegendmarker_p.h82
-rw-r--r--src/charts/legend/qpielegendmarker.cpp144
-rw-r--r--src/charts/legend/qpielegendmarker.h57
-rw-r--r--src/charts/legend/qpielegendmarker_p.h68
-rw-r--r--src/charts/legend/qxylegendmarker.cpp138
-rw-r--r--src/charts/legend/qxylegendmarker.h55
-rw-r--r--src/charts/legend/qxylegendmarker_p.h64
-rw-r--r--src/charts/linechart/linechart.pri (renamed from src/linechart/linechart.pri)0
-rw-r--r--src/charts/linechart/linechartitem.cpp405
-rw-r--r--src/charts/linechart/linechartitem_p.h91
-rw-r--r--src/charts/linechart/qlineseries.cpp173
-rw-r--r--src/charts/linechart/qlineseries.h52
-rw-r--r--src/charts/linechart/qlineseries_p.h51
-rw-r--r--src/charts/piechart/piechart.pri (renamed from src/piechart/piechart.pri)0
-rw-r--r--src/charts/piechart/piechartitem.cpp228
-rw-r--r--src/charts/piechart/piechartitem_p.h86
-rw-r--r--src/charts/piechart/pieslicedata_p.h141
-rw-r--r--src/charts/piechart/piesliceitem.cpp319
-rw-r--r--src/charts/piechart/piesliceitem_p.h91
-rw-r--r--src/charts/piechart/qhpiemodelmapper.cpp267
-rw-r--r--src/charts/piechart/qhpiemodelmapper.h70
-rw-r--r--src/charts/piechart/qpiemodelmapper.cpp568
-rw-r--r--src/charts/piechart/qpiemodelmapper.h69
-rw-r--r--src/charts/piechart/qpiemodelmapper_p.h99
-rw-r--r--src/charts/piechart/qpieseries.cpp947
-rw-r--r--src/charts/piechart/qpieseries.h103
-rw-r--r--src/charts/piechart/qpieseries_p.h93
-rw-r--r--src/charts/piechart/qpieslice.cpp794
-rw-r--r--src/charts/piechart/qpieslice.h147
-rw-r--r--src/charts/piechart/qpieslice_p.h80
-rw-r--r--src/charts/piechart/qvpiemodelmapper.cpp270
-rw-r--r--src/charts/piechart/qvpiemodelmapper.h70
-rw-r--r--src/charts/qabstractseries.cpp328
-rw-r--r--src/charts/qabstractseries.h98
-rw-r--r--src/charts/qabstractseries_p.h105
-rw-r--r--src/charts/qchart.cpp872
-rw-r--r--src/charts/qchart.h183
-rw-r--r--src/charts/qchart_p.h70
-rw-r--r--src/charts/qchartglobal.h78
-rw-r--r--src/charts/qchartview.cpp317
-rw-r--r--src/charts/qchartview.h74
-rw-r--r--src/charts/qchartview_p.h65
-rw-r--r--src/charts/qpolarchart.cpp133
-rw-r--r--src/charts/qpolarchart.h60
-rw-r--r--src/charts/scatterchart/qscatterseries.cpp336
-rw-r--r--src/charts/scatterchart/qscatterseries.h75
-rw-r--r--src/charts/scatterchart/qscatterseries_p.h53
-rw-r--r--src/charts/scatterchart/scatter.pri (renamed from src/scatterchart/scatter.pri)0
-rw-r--r--src/charts/scatterchart/scatterchartitem.cpp237
-rw-r--r--src/charts/scatterchart/scatterchartitem_p.h151
-rw-r--r--src/charts/scroller.cpp216
-rw-r--r--src/charts/scroller_p.h109
-rw-r--r--src/charts/splinechart/qsplineseries.cpp165
-rw-r--r--src/charts/splinechart/qsplineseries.h51
-rw-r--r--src/charts/splinechart/qsplineseries_p.h54
-rw-r--r--src/charts/splinechart/splinechart.pri (renamed from src/splinechart/splinechart.pri)0
-rw-r--r--src/charts/splinechart/splinechartitem.cpp485
-rw-r--r--src/charts/splinechart/splinechartitem_p.h94
-rw-r--r--src/charts/themes/charttheme_p.h93
-rw-r--r--src/charts/themes/chartthemebluecerulean_p.h70
-rw-r--r--src/charts/themes/chartthemeblueicy_p.h72
-rw-r--r--src/charts/themes/chartthemebluencs_p.h71
-rw-r--r--src/charts/themes/chartthemebrownsand_p.h71
-rw-r--r--src/charts/themes/chartthemedark_p.h71
-rw-r--r--src/charts/themes/chartthemehighcontrast_p.h73
-rw-r--r--src/charts/themes/chartthemelight_p.h73
-rw-r--r--src/charts/themes/chartthemeqt_p.h74
-rw-r--r--src/charts/themes/chartthemesystem_p.h177
-rw-r--r--src/charts/themes/themes.pri (renamed from src/themes/themes.pri)0
-rw-r--r--src/charts/xychart/qhxymodelmapper.cpp243
-rw-r--r--src/charts/xychart/qhxymodelmapper.h70
-rw-r--r--src/charts/xychart/qvxymodelmapper.cpp243
-rw-r--r--src/charts/xychart/qvxymodelmapper.h70
-rw-r--r--src/charts/xychart/qxymodelmapper.cpp533
-rw-r--r--src/charts/xychart/qxymodelmapper.h69
-rw-r--r--src/charts/xychart/qxymodelmapper_p.h97
-rw-r--r--src/charts/xychart/qxyseries.cpp801
-rw-r--r--src/charts/xychart/qxyseries.h120
-rw-r--r--src/charts/xychart/qxyseries_p.h79
-rw-r--r--src/charts/xychart/xychart.cpp189
-rw-r--r--src/charts/xychart/xychart.pri20
-rw-r--r--src/charts/xychart/xychart_p.h92
-rw-r--r--src/chartsnamespace.h28
-rw-r--r--src/chartsqml2/chartsqml2.pro69
-rw-r--r--src/chartsqml2/chartsqml2_plugin.cpp312
-rw-r--r--src/chartsqml2/declarativeareaseries.cpp115
-rw-r--r--src/chartsqml2/declarativeareaseries.h94
-rw-r--r--src/chartsqml2/declarativeaxes.cpp61
-rw-r--r--src/chartsqml2/declarativeaxes.h72
-rw-r--r--src/chartsqml2/declarativebarseries.cpp509
-rw-r--r--src/chartsqml2/declarativebarseries.h361
-rw-r--r--src/chartsqml2/declarativeboxplotseries.cpp423
-rw-r--r--src/chartsqml2/declarativeboxplotseries.h142
-rw-r--r--src/chartsqml2/declarativecategoryaxis.cpp100
-rw-r--r--src/chartsqml2/declarativecategoryaxis.h76
-rw-r--r--src/chartsqml2/declarativechart.cpp1063
-rw-r--r--src/chartsqml2/declarativechart.h231
-rw-r--r--src/chartsqml2/declarativelineseries.cpp104
-rw-r--r--src/chartsqml2/declarativelineseries.h109
-rw-r--r--src/chartsqml2/declarativemargins.cpp113
-rw-r--r--src/chartsqml2/declarativemargins.h54
-rw-r--r--src/chartsqml2/declarativepieseries.cpp154
-rw-r--r--src/chartsqml2/declarativepieseries.h85
-rw-r--r--src/chartsqml2/declarativepolarchart.cpp64
-rw-r--r--src/chartsqml2/declarativepolarchart.h41
-rw-r--r--src/chartsqml2/declarativescatterseries.cpp114
-rw-r--r--src/chartsqml2/declarativescatterseries.h116
-rw-r--r--src/chartsqml2/declarativesplineseries.cpp104
-rw-r--r--src/chartsqml2/declarativesplineseries.h109
-rw-r--r--src/chartsqml2/declarativexypoint.cpp54
-rw-r--r--src/chartsqml2/declarativexypoint.h42
-rw-r--r--src/chartsqml2/declarativexyseries.cpp118
-rw-r--r--src/chartsqml2/declarativexyseries.h54
-rw-r--r--src/chartsqml2/plugins.qmltypes2305
-rw-r--r--src/chartsqml2/qmldir4
-rw-r--r--src/chartthememanager.cpp249
-rw-r--r--src/chartthememanager_p.h84
-rw-r--r--src/charttitle.cpp91
-rw-r--r--src/charttitle_p.h53
-rw-r--r--src/domain/abstractdomain.cpp266
-rw-r--r--src/domain/abstractdomain_p.h132
-rw-r--r--src/domain/logxlogydomain.cpp278
-rw-r--r--src/domain/logxlogydomain_p.h79
-rw-r--r--src/domain/logxlogypolardomain.cpp273
-rw-r--r--src/domain/logxlogypolardomain_p.h81
-rw-r--r--src/domain/logxydomain.cpp245
-rw-r--r--src/domain/logxydomain_p.h75
-rw-r--r--src/domain/logxypolardomain.cpp242
-rw-r--r--src/domain/logxypolardomain_p.h77
-rw-r--r--src/domain/polardomain.cpp91
-rw-r--r--src/domain/polardomain_p.h62
-rw-r--r--src/domain/xlogydomain.cpp241
-rw-r--r--src/domain/xlogydomain_p.h75
-rw-r--r--src/domain/xlogypolardomain.cpp237
-rw-r--r--src/domain/xlogypolardomain_p.h77
-rw-r--r--src/domain/xydomain.cpp186
-rw-r--r--src/domain/xydomain_p.h64
-rw-r--r--src/domain/xypolardomain.cpp184
-rw-r--r--src/domain/xypolardomain_p.h65
-rw-r--r--src/layout/abstractchartlayout.cpp203
-rw-r--r--src/layout/abstractchartlayout_p.h82
-rw-r--r--src/layout/cartesianchartlayout.cpp246
-rw-r--r--src/layout/cartesianchartlayout_p.h50
-rw-r--r--src/layout/polarchartlayout.cpp82
-rw-r--r--src/layout/polarchartlayout_p.h50
-rw-r--r--src/legend/legendlayout.cpp506
-rw-r--r--src/legend/legendlayout_p.h84
-rw-r--r--src/legend/legendmarkeritem.cpp191
-rw-r--r--src/legend/legendmarkeritem_p.h101
-rw-r--r--src/legend/legendscroller.cpp74
-rw-r--r--src/legend/legendscroller_p.h57
-rw-r--r--src/legend/qarealegendmarker.cpp126
-rw-r--r--src/legend/qarealegendmarker.h56
-rw-r--r--src/legend/qarealegendmarker_p.h64
-rw-r--r--src/legend/qbarlegendmarker.cpp146
-rw-r--r--src/legend/qbarlegendmarker.h57
-rw-r--r--src/legend/qbarlegendmarker_p.h66
-rw-r--r--src/legend/qboxplotlegendmarker.cpp127
-rw-r--r--src/legend/qboxplotlegendmarker.h55
-rw-r--r--src/legend/qboxplotlegendmarker_p.h64
-rw-r--r--src/legend/qlegend.cpp623
-rw-r--r--src/legend/qlegend.h112
-rw-r--r--src/legend/qlegend_p.h101
-rw-r--r--src/legend/qlegendmarker.cpp294
-rw-r--r--src/legend/qlegendmarker.h105
-rw-r--r--src/legend/qlegendmarker_p.h82
-rw-r--r--src/legend/qpielegendmarker.cpp144
-rw-r--r--src/legend/qpielegendmarker.h57
-rw-r--r--src/legend/qpielegendmarker_p.h68
-rw-r--r--src/legend/qxylegendmarker.cpp138
-rw-r--r--src/legend/qxylegendmarker.h55
-rw-r--r--src/legend/qxylegendmarker_p.h64
-rw-r--r--src/linechart/linechartitem.cpp405
-rw-r--r--src/linechart/linechartitem_p.h91
-rw-r--r--src/linechart/qlineseries.cpp172
-rw-r--r--src/linechart/qlineseries.h52
-rw-r--r--src/linechart/qlineseries_p.h51
-rw-r--r--src/piechart/piechartitem.cpp228
-rw-r--r--src/piechart/piechartitem_p.h86
-rw-r--r--src/piechart/pieslicedata_p.h141
-rw-r--r--src/piechart/piesliceitem.cpp319
-rw-r--r--src/piechart/piesliceitem_p.h91
-rw-r--r--src/piechart/qhpiemodelmapper.cpp257
-rw-r--r--src/piechart/qhpiemodelmapper.h70
-rw-r--r--src/piechart/qpiemodelmapper.cpp568
-rw-r--r--src/piechart/qpiemodelmapper.h69
-rw-r--r--src/piechart/qpiemodelmapper_p.h99
-rw-r--r--src/piechart/qpieseries.cpp944
-rw-r--r--src/piechart/qpieseries.h103
-rw-r--r--src/piechart/qpieseries_p.h93
-rw-r--r--src/piechart/qpieslice.cpp789
-rw-r--r--src/piechart/qpieslice.h147
-rw-r--r--src/piechart/qpieslice_p.h80
-rw-r--r--src/piechart/qvpiemodelmapper.cpp260
-rw-r--r--src/piechart/qvpiemodelmapper.h70
-rw-r--r--src/qabstractseries.cpp333
-rw-r--r--src/qabstractseries.h98
-rw-r--r--src/qabstractseries_p.h105
-rw-r--r--src/qchart.cpp872
-rw-r--r--src/qchart.h183
-rw-r--r--src/qchart_p.h70
-rw-r--r--src/qchartglobal.h97
-rw-r--r--src/qchartview.cpp317
-rw-r--r--src/qchartview.h74
-rw-r--r--src/qchartview_p.h65
-rw-r--r--src/qpolarchart.cpp133
-rw-r--r--src/qpolarchart.h60
-rw-r--r--src/scatterchart/qscatterseries.cpp334
-rw-r--r--src/scatterchart/qscatterseries.h75
-rw-r--r--src/scatterchart/qscatterseries_p.h53
-rw-r--r--src/scatterchart/scatterchartitem.cpp237
-rw-r--r--src/scatterchart/scatterchartitem_p.h151
-rw-r--r--src/scroller.cpp216
-rw-r--r--src/scroller_p.h109
-rw-r--r--src/splinechart/qsplineseries.cpp164
-rw-r--r--src/splinechart/qsplineseries.h51
-rw-r--r--src/splinechart/qsplineseries_p.h54
-rw-r--r--src/splinechart/splinechartitem.cpp485
-rw-r--r--src/splinechart/splinechartitem_p.h94
-rw-r--r--src/src.pro270
-rw-r--r--src/themes/charttheme_p.h93
-rw-r--r--src/themes/chartthemebluecerulean_p.h70
-rw-r--r--src/themes/chartthemeblueicy_p.h72
-rw-r--r--src/themes/chartthemebluencs_p.h71
-rw-r--r--src/themes/chartthemebrownsand_p.h71
-rw-r--r--src/themes/chartthemedark_p.h71
-rw-r--r--src/themes/chartthemehighcontrast_p.h73
-rw-r--r--src/themes/chartthemelight_p.h73
-rw-r--r--src/themes/chartthemeqt_p.h74
-rw-r--r--src/themes/chartthemesystem_p.h177
-rw-r--r--src/xychart/qhxymodelmapper.cpp246
-rw-r--r--src/xychart/qhxymodelmapper.h70
-rw-r--r--src/xychart/qvxymodelmapper.cpp246
-rw-r--r--src/xychart/qvxymodelmapper.h70
-rw-r--r--src/xychart/qxymodelmapper.cpp533
-rw-r--r--src/xychart/qxymodelmapper.h69
-rw-r--r--src/xychart/qxymodelmapper_p.h97
-rw-r--r--src/xychart/qxyseries.cpp804
-rw-r--r--src/xychart/qxyseries.h120
-rw-r--r--src/xychart/qxyseries_p.h79
-rw-r--r--src/xychart/xychart.cpp189
-rw-r--r--src/xychart/xychart.pri21
-rw-r--r--src/xychart/xychart_p.h92
-rw-r--r--sync.profile19
-rw-r--r--tests/auto/auto.pri22
-rw-r--r--tests/auto/auto.pro25
-rw-r--r--tests/auto/chartdataset/chartdataset.pro2
-rw-r--r--tests/auto/chartdataset/tst_chartdataset.cpp6
-rw-r--r--tests/auto/domain/domain.pro2
-rw-r--r--tests/auto/domain/tst_domain.cpp6
-rw-r--r--tests/auto/inc/tst_definitions.h35
-rw-r--r--tests/auto/qabstractaxis/tst_qabstractaxis.cpp16
-rw-r--r--tests/auto/qabstractaxis/tst_qabstractaxis.h2
-rw-r--r--tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp2
-rw-r--r--tests/auto/qbarseries/tst_qbarseries.cpp2
-rw-r--r--tests/auto/qbarset/tst_qbarset.cpp2
-rw-r--r--tests/auto/qchart/tst_qchart.cpp2
-rw-r--r--tests/auto/qchartview/tst_qchartview.cpp8
-rw-r--r--tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp2
-rw-r--r--tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp2
-rw-r--r--tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp2
-rw-r--r--tests/auto/qlegend/tst_qlegend.cpp2
-rw-r--r--tests/auto/qml-qtquicktest/qml-qtquicktest.pro14
-rw-r--r--tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml4
-rw-r--r--tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml118
-rw-r--r--tests/auto/qml-qtquicktest/tst_barseries.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barseries_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barseries_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barseries_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_barseries_1_4.qml163
-rw-r--r--tests/auto/qml-qtquicktest/tst_boxplotseries.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml100
-rw-r--r--tests/auto/qml-qtquicktest/tst_categoryaxis.qml4
-rw-r--r--tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml84
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartview.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartview_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartview_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartview_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartview_1_4.qml80
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml160
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewsignals.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml73
-rw-r--r--tests/auto/qml-qtquicktest/tst_pieseries.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml135
-rw-r--r--tests/auto/qml-qtquicktest/tst_valueaxis.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml116
-rw-r--r--tests/auto/qml-qtquicktest/tst_xyseries.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml2
-rw-r--r--tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml262
-rw-r--r--tests/auto/qml/qml.pro2
-rw-r--r--tests/auto/qml/tst_qml.cpp107
-rw-r--r--tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp2
-rw-r--r--tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp2
-rw-r--r--tests/auto/qpieseries/tst_qpieseries.cpp2
-rw-r--r--tests/auto/qpieslice/tst_qpieslice.cpp2
-rw-r--r--tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp2
-rw-r--r--tests/auto/quick2/quick2.pro5
-rw-r--r--tests/auto/quick2/tst_quick2.cpp142
-rw-r--r--tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp2
-rw-r--r--tests/auto/qxyseries/tst_qxyseries.h2
-rw-r--r--tests/boxplottester/main.cpp4
-rw-r--r--tests/boxplottester/mainwidget.cpp7
-rw-r--r--tests/boxplottester/mainwidget.h2
-rw-r--r--tests/chartdesigner/engine.cpp2
-rw-r--r--tests/chartdesigner/engine.h6
-rw-r--r--tests/chartdesigner/mainwindow.cpp2
-rw-r--r--tests/chartdesigner/mainwindow.h6
-rw-r--r--tests/chartviewer/charts.h6
-rw-r--r--tests/chartviewer/chartviewer.pro2
-rw-r--r--tests/chartviewer/grid.h6
-rw-r--r--tests/chartviewer/window.h6
-rw-r--r--tests/chartwidgettest/main.cpp4
-rw-r--r--tests/chartwidgettest/mainwidget.cpp3
-rw-r--r--tests/chartwidgettest/mainwidget.h2
-rw-r--r--tests/polarcharttest/chartview.cpp2
-rw-r--r--tests/polarcharttest/chartview.h2
-rw-r--r--tests/polarcharttest/mainwindow.cpp2
-rw-r--r--tests/polarcharttest/mainwindow.h2
-rw-r--r--tests/presenterchart/chartview.h2
-rw-r--r--tests/qmlchartaxis/main.cpp34
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/Button.qml2
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml4
-rw-r--r--tests/qmlchartaxis/qml/qmlchartaxis/main.qml6
-rw-r--r--tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--tests/qmlchartaxis/qmlchartaxis.pro1
-rw-r--r--tests/qmlchartproperties/main.cpp36
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/Button.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml6
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml6
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml5
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml5
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml6
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml2
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml6
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml4
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/loader.qml37
-rw-r--r--tests/qmlchartproperties/qml/qmlchartproperties/main.qml6
-rw-r--r--tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp177
-rw-r--r--tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h46
-rw-r--r--tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri13
-rw-r--r--tests/qmlchartproperties/qmlchartproperties.pro1
-rw-r--r--tests/qmlchartproperties/resources.qrc1
-rw-r--r--tests/quick2chartproperties/main.cpp42
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/AreaChart.qml111
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/AreaEditor.qml111
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/BarChart.qml76
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/BarEditor.qml199
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/Button.qml70
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/Chart.qml110
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditor.qml119
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorAxis.qml131
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorLegend.qml80
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorProperties.qml124
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorSeries.qml64
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorTitle.qml35
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/FontEditor.qml92
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/HorizontalBarChart.qml77
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/HorizontalPercentBarChart.qml79
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/HorizontalStackedBarChart.qml79
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/LineChart.qml78
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/LineEditor.qml123
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/PercentBarChart.qml78
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/PieChart.qml67
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/PieEditor.qml228
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ScatterChart.qml75
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/ScatterEditor.qml118
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/SplineChart.qml77
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/StackedBarChart.qml77
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/loader.qml37
-rw-r--r--tests/quick2chartproperties/qml/quick2chartproperties/main.qml179
-rw-r--r--tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp87
-rw-r--r--tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.h33
-rw-r--r--tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.pri6
-rw-r--r--tests/quick2chartproperties/quick2chartproperties.pro9
-rw-r--r--tests/quick2chartproperties/resources.qrc31
-rw-r--r--tests/tests.pri39
-rw-r--r--tests/tests.pro14
-rw-r--r--tests/wavechart/wavechart.cpp2
-rw-r--r--tests/wavechart/wavechart.h2
-rw-r--r--tools/demoLauncher/demoLauncher.pro2
-rw-r--r--tools/demoLauncher/widget.cpp6
1533 files changed, 65384 insertions, 73669 deletions
diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 00000000..30dcb90f
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1,4 @@
+load(qt_build_config)
+CONFIG += qt_example_installs
+
+MODULE_VERSION=2.0.0
diff --git a/charts.pro b/charts.pro
deleted file mode 100644
index b16930b8..00000000
--- a/charts.pro
+++ /dev/null
@@ -1,91 +0,0 @@
-!include(config.pri) {
- error('Missing config.pri')
-}
-
-TEMPLATE = subdirs
-SUBDIRS = src plugins
-!nomake_demos_examples: SUBDIRS += demos examples
-exists(tests): SUBDIRS += tests
-
-development_build: message('Development build')
-
-CONFIG += ordered
-QMAKE_CXXFLAGS += -g -Wall
-unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
-win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
-
-# install feature file
-feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
-feature.files = $$PWD/features/qtcommercialchart.prf
-INSTALLS += feature
-
-# docs
-CHARTS_VERSION = 1.4.0
-CHARTS_VERSION_TAG = 140
-
-contains(QT_MAJOR_VERSION, 5) {
- QDOC_CONFFILE = qcharts-qt5.qdocconf
- DEFINES += QDOC_QT5
-} else {
- QDOC_CONFFILE = qcharts-qt4.qdocconf
-}
-
-contains(QMAKE_HOST.os, Windows) {
- QDOC_CONF = $$CHART_BUILD_DOC_DIR\\docconf\\$$QDOC_CONFFILE
- win32-g++|qnx {
- VERSION_SETTINGS = \
- set QT_CHARTS_VERSION=$$CHARTS_VERSION&& set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG&&
- } else {
- VERSION_SETTINGS = \
- set QT_CHARTS_VERSION=$$CHARTS_VERSION $$escape_expand(\\n\\t) \
- set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
- }
-} else {
- QDOC_CONF = $$CHART_BUILD_DOC_DIR/docconf/$$QDOC_CONFFILE
- VERSION_SETTINGS = \
- QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
-}
-
-contains(QT_MAJOR_VERSION, 5) {
- QDOC_CMD = qdoc
- HELPGENERATOR_CMD = qhelpgenerator -platform minimal
-} else {
- QDOC_CMD = qdoc3
- HELPGENERATOR_CMD = qhelpgenerator
-}
-
-QHP_FILE = doc/html/qtcharts.qhp
-QCH_FILE = doc/qch/qtcharts.qch
-
-docs.target = docs
-docs.depends = qch_docs FORCE
-qch_docs.target = qch_docs
-qch_docs.commands = $$HELPGENERATOR_CMD $$QHP_FILE -o $$QCH_FILE
-qch_docs.depends = html_docs FORCE
-html_docs.target = html_docs
-html_docs.commands = $$VERSION_SETTINGS $$QDOC_CMD $$QDOC_CONF
-html_docs.depends = FORCE
-
-QMAKE_EXTRA_TARGETS += docs qch_docs html_docs
-
-# coverage
-unix:coverage:{
- QMAKE_DISTCLEAN += -r ./coverage
- QMAKE_CLEAN += build/*.gcda build/*.gcno
- QMAKE_EXTRA_TARGETS += buildcoverage runcoverage gencoverage
-
- buildcoverage.target = build_coverage
- buildcoverage.depends = all
- buildcoverage.commands = mkdir -p ./coverage; \
- make -C src prepare_coverage;
-
- runcoverage.target = run_coverage
- runcoverage.depends = buildcoverage
- runcoverage.commands = for f in `ls ./bin/tst_*` ; do echo "processing \$\$f test..."; \$\$f >> unit.log; done ; exit 0;
-
- gencoverage.target = gen_coverage
- gencoverage.depends = runcoverage
- gencoverage.commands = make -C src gen_coverage; \
- genhtml -o ./coverage ./coverage/coverage.info --prefix $$PWD
-}
-
diff --git a/config.pri b/config.pri
deleted file mode 100644
index de6ec0fb..00000000
--- a/config.pri
+++ /dev/null
@@ -1,127 +0,0 @@
-##################### LIB #################################################
-
-LIBRARY_NAME = QtCommercialChart
-ios:CONFIG(iphonesimulator, iphonesimulator|iphoneos):LIBRARY_NAME = $$join(LIBRARY_NAME,,,_iphonesimulator)
-CONFIG(debug, debug|release) {
- mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
- win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
-}
-
-LIBS += -l$$LIBRARY_NAME
-
-# This will undefine Q_DECL_EXPORT/Q_DECL_IMPORT at qchartglobal.h
-# They should not be used for staticlib builds.
-static|staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
-
-#################### COVERAGE #################################################################
-coverage: CONFIG += debug
-
-##################### SHADOW CONFIG #################################################
-
-!contains($${PWD}, $${OUT_PWD}){
- search = "$$PWD:::"
- temp = $$split(search,"/")
- temp = $$last(temp)
- path = $$replace(search,$$temp,'')
- temp = $$split(OUT_PWD,$$path)
- temp = $$split(temp,'/')
- temp = $$first(temp)
- path = "$${path}$${temp}"
- SHADOW=$$path
-}else{
- SHADOW=$$PWD
- CONFIG-=development_build
-}
-
-##################### BUILD PATHS ##################################################
-
-CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
-CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
-CHART_BUILD_LIB_DIR = $$SHADOW/lib
-CHART_BUILD_DIR = $$SHADOW/build
-CHART_BUILD_BIN_DIR = $$SHADOW/bin
-CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR
-CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR
-CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
-CHART_BUILD_DOC_DIR = $$SHADOW/doc
-
-CONFIG(release,debug|release){
- CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/release
- CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/release
- CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/release/imports/QtCommercial/Chart
- CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML2_PLUGIN_DIR/release/qml/QtCommercial/Chart
- CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
-}
-
-
-CONFIG(debug,debug|release){
- CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/debug
- CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/debug
- CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/debug/imports/QtCommercial/Chart
- CHART_BUILD_QML2_PLUGIN_DIR = $$CHART_BUILD_QML2_PLUGIN_DIR/debug/qml/QtCommercial/Chart
- CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
-}
-# Use own folders for debug and release builds
-
-CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
-CONFIG(release, debug|release): CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/release)
-
-
-contains(QMAKE_HOST.os, Windows) {
- CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
- CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
- CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
- CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
- CHART_BUILD_QML_PLUGIN_DIR = $$replace(CHART_BUILD_QML_PLUGIN_DIR, "/","\\")
- CHART_BUILD_QML2_PLUGIN_DIR = $$replace(CHART_BUILD_QML2_PLUGIN_DIR, "/","\\")
- CHART_BUILD_DESIGNER_PLUGIN_DIR = $$replace(CHART_BUILD_DESIGNER_PLUGIN_DIR, "/","\\")
- CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
- CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
-}
-
-macx:!ios {
- # Some Qt versions use an incompatible configuration on OSX which makes the build fail.
- # As a work-around, set the minimum OSX version to 10.5.
- QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
- QMAKE_LFLAGS *= -mmacosx-version-min=10.5
-}
-
-linux-arm*: {
- DEFINES+=QT_ON_ARM
-}
-
-##################### INCLUDES ############################################################
-
-
-INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR $$[QT_INSTALL_HEADERS]/QtCommercialChart
-
-!exists($$CHART_BUILD_LIB_DIR) {
- system($$QMAKE_MKDIR $$CHART_BUILD_LIB_DIR)
-}
-!win32: {
- LIBS += -L$$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
-} else {
- win32-msvc*: {
- # hack fix for error:
- # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
- QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
- } else {
- LIBS += -L$$CHART_BUILD_LIB_DIR
- }
-}
-LIBS += -L$$[QT_INSTALL_LIBS]
-
-##################### DEVELOPMENT BUILD ###################################################
-
-development_build: {
- DEFINES+=DEVELOPMENT_BUILD
- CONFIG+=debug_and_release
- CONFIG+=build_all
-}
-
-##################### UNIT TESTS ##############################################################
-
-CONFIG(debug, debug|release) {
- DEFINES+=BUILD_PRIVATE_UNIT_TESTS
-}
-
diff --git a/demos/audio/audio.pro b/demos/audio/audio.pro
deleted file mode 100644
index 0bd25015..00000000
--- a/demos/audio/audio.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-
-QT += multimedia
-
-TARGET = audio
-TEMPLATE = app
-
-SOURCES += main.cpp\
- widget.cpp \
- xyseriesiodevice.cpp
-
-HEADERS += widget.h \
- xyseriesiodevice.h
diff --git a/demos/audio/widget.cpp b/demos/audio/widget.cpp
deleted file mode 100644
index f31de40b..00000000
--- a/demos/audio/widget.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "widget.h"
-#include <QAudioDeviceInfo>
-#include <QAudioInput>
-#include <QChartView>
-#include <QLineSeries>
-#include <QChart>
-#include <QVBoxLayout>
-#include <QValueAxis>
-#include "xyseriesiodevice.h"
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-Widget::Widget(QWidget *parent)
- : QWidget(parent),
- m_device(0),
- m_chart(0),
- m_series(0),
- m_audioInput(0)
-{
- m_chart = new QChart;
- QChartView *chartView = new QChartView(m_chart);
- chartView->setMinimumSize(800, 600);
- m_series = new QLineSeries;
- m_chart->addSeries(m_series);
- QValueAxis *axisX = new QValueAxis;
- axisX->setRange(0, 2000);
- axisX->setLabelFormat("%g");
- axisX->setTitleText("Samples");
- QValueAxis *axisY = new QValueAxis;
- axisY->setRange(-1, 1);
- axisY->setTitleText("Audio level");
- m_chart->setAxisX(axisX, m_series);
- m_chart->setAxisY(axisY, m_series);
- m_chart->legend()->hide();
- m_chart->setTitle("Data from the microphone");
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(chartView);
- setLayout(mainLayout);
-
- QAudioFormat formatAudio;
- formatAudio.setSampleRate(8000);
- formatAudio.setChannelCount(1);
- formatAudio.setSampleSize(8);
- formatAudio.setCodec("audio/pcm");
- formatAudio.setByteOrder(QAudioFormat::LittleEndian);
- formatAudio.setSampleType(QAudioFormat::UnSignedInt);
-
- QAudioDeviceInfo inputDevices = QAudioDeviceInfo::defaultInputDevice();
- m_audioInput = new QAudioInput(inputDevices,formatAudio, this);
-
- m_device = new XYSeriesIODevice(m_series, this);
- m_device->open(QIODevice::WriteOnly);
-
- m_audioInput->start(m_device);
-}
-
-Widget::~Widget()
-{
- m_audioInput->stop();
- m_device->close();
-}
diff --git a/demos/audio/widget.h b/demos/audio/widget.h
deleted file mode 100644
index fa6a2804..00000000
--- a/demos/audio/widget.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef WIDGET_H
-#define WIDGET_H
-
-#include <QWidget>
-#include <QChartGlobal>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QLineSeries;
-class QChart;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class XYSeriesIODevice;
-class QAudioInput;
-
-class Widget : public QWidget
-{
- Q_OBJECT
-
-public:
- Widget(QWidget *parent = 0);
- ~Widget();
-
-private:
- XYSeriesIODevice *m_device;
- QChart *m_chart;
- QLineSeries *m_series;
- QAudioInput *m_audioInput;
-};
-
-#endif // WIDGET_H
diff --git a/demos/audio/xyseriesiodevice.h b/demos/audio/xyseriesiodevice.h
deleted file mode 100644
index f7f9fbdd..00000000
--- a/demos/audio/xyseriesiodevice.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef XYSERIESIODEVICE_H
-#define XYSERIESIODEVICE_H
-
-#include <QIODevice>
-#include <QChartGlobal>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QXYSeries;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class XYSeriesIODevice : public QIODevice
-{
- Q_OBJECT
-public:
- explicit XYSeriesIODevice(QXYSeries * series, QObject *parent = 0);
-
-protected:
- qint64 readData(char * data, qint64 maxSize);
- qint64 writeData(const char * data, qint64 maxSize);
-
-private:
- QXYSeries *m_series;
-};
-
-#endif // XYSERIESIODEVICE_H
diff --git a/demos/callout/callout.pro b/demos/callout/callout.pro
deleted file mode 100644
index ebe7b466..00000000
--- a/demos/callout/callout.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the examples.pri file!" )
-}
-
-TARGET = callout
-TEMPLATE = app
-
-SOURCES += \
- main.cpp\
- callout.cpp \
- view.cpp
-
-HEADERS += \
- callout.h \
- view.h
diff --git a/demos/callout/view.h b/demos/callout/view.h
deleted file mode 100644
index 384e8a89..00000000
--- a/demos/callout/view.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef VIEW_H
-#define VIEW_H
-#include <QGraphicsView>
-#include <QChartGlobal>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QChart;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-class QGraphicsScene;
-class QResizeEvent;
-class Callout;
-class QMouseEvent;
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class View: public QGraphicsView
-{
- Q_OBJECT
-
-public:
- View(QWidget *parent = 0);
-
-protected:
- void resizeEvent(QResizeEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
-
-public slots:
- void keepCallout();
- void tooltip(QPointF point, bool state);
-
-private:
- QGraphicsSimpleTextItem *m_coordX;
- QGraphicsSimpleTextItem *m_coordY;
- QChart *m_chart;
- Callout *m_tooltip;
-};
-
-#endif
diff --git a/demos/chartinteractions/chart.h b/demos/chartinteractions/chart.h
deleted file mode 100644
index 9d94f449..00000000
--- a/demos/chartinteractions/chart.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CHART_H
-#define CHART_H
-
-#include <QChart>
-#include <QLineSeries>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class Chart : public QChart
-{
- Q_OBJECT
-public:
- explicit Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0, QLineSeries *series = 0);
- ~Chart();
-
-public slots:
- void clickPoint(const QPointF &point);
-
-public:
- void handlePointMove(const QPoint &point);
- void setPointClicked(bool clicked);
-
-private:
- qreal distance(const QPointF &p1, const QPointF &p2);
- QLineSeries *m_series;
- QPointF m_movingPoint;
-
- //Boolean value to determine if an actual point in the
- //series is clicked.
- bool m_clicked;
-};
-
-#endif // CHART_H
diff --git a/demos/chartinteractions/chartinteractions.pro b/demos/chartinteractions/chartinteractions.pro
deleted file mode 100644
index b00f2f43..00000000
--- a/demos/chartinteractions/chartinteractions.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-
-QT += core gui
-
-TARGET = chartinteractions
-TEMPLATE = app
-
-HEADERS += chart.h chartview.h
-SOURCES += main.cpp chart.cpp chartview.cpp
diff --git a/demos/chartinteractions/chartview.h b/demos/chartinteractions/chartview.h
deleted file mode 100644
index 5623430d..00000000
--- a/demos/chartinteractions/chartview.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CHARTVIEW_H
-#define CHARTVIEW_H
-
-#include <QChartView>
-
-class Chart;
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class ChartView : public QChartView
-{
-public:
- ChartView(Chart *chart, QWidget *parent = 0);
-
-protected:
- void mousePressEvent(QMouseEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
-
-private:
- Chart *m_chart;
- QPoint m_mousePos;
-};
-
-#endif
diff --git a/demos/chartinteractions/main.cpp b/demos/chartinteractions/main.cpp
deleted file mode 100644
index 9e11d847..00000000
--- a/demos/chartinteractions/main.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QMainWindow>
-#include <QLineSeries>
-
-#include <QValueAxis>
-
-#include "chart.h"
-#include "chartview.h"
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
-
- QLineSeries *series = new QLineSeries();
-
- series->append(0, 6);
- series->append(1, 3);
- series->append(2, 4);
- series->append(3, 8);
- series->append(7, 13);
- series->append(10, 5);
- *series << QPointF(11, 1) << QPointF(13, 3) << QPointF(17, 6) << QPointF(18, 3) << QPointF(20, 2);
-
- Chart *chart = new Chart(0, 0, series);
- chart->legend()->hide();
- chart->addSeries(series);
- QPen p = series->pen();
- p.setWidth(5);
- series->setPen(p);
- chart->createDefaultAxes();
- chart->setTitle("Drag'n drop to move data points");
-
- QValueAxis *axisX = new QValueAxis();
- chart->setAxisX(axisX, series);
- axisX->setRange(0, 20);
-
- QValueAxis *axisY = new QValueAxis();
- chart->setAxisY(axisY, series);
- axisY->setRange(0, 13);
-
- QObject::connect(series, SIGNAL(clicked(QPointF)), chart, SLOT(clickPoint(QPointF)));
-
- ChartView *chartView = new ChartView(chart);
- chartView->setRenderHint(QPainter::Antialiasing);
-
- QMainWindow window;
- window.setCentralWidget(chartView);
- window.resize(400, 300);
- window.show();
-
- return a.exec();
-}
diff --git a/demos/chartthemes/chartthemes.pro b/demos/chartthemes/chartthemes.pro
deleted file mode 100644
index d9a61a74..00000000
--- a/demos/chartthemes/chartthemes.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-TARGET = chartthemes
-SOURCES = main.cpp themewidget.cpp
-HEADERS = themewidget.h
diff --git a/demos/chartthemes/themewidget.h b/demos/chartthemes/themewidget.h
deleted file mode 100644
index 4b1b677c..00000000
--- a/demos/chartthemes/themewidget.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef THEMEWIDGET_H
-#define THEMEWIDGET_H
-
-#include <QWidget>
-#include <QChartGlobal>
-
-class QComboBox;
-class QCheckBox;
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QChartView;
-class QChart;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-typedef QPair<QPointF, QString> Data;
-typedef QList<Data> DataList;
-typedef QList<DataList> DataTable;
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class ThemeWidget: public QWidget
-{
- Q_OBJECT
-public:
- explicit ThemeWidget(QWidget *parent = 0);
- ~ThemeWidget();
-
-private Q_SLOTS:
- void updateUI();
-
-private:
- DataTable generateRandomData(int listCount, int valueMax, int valueCount) const;
- QComboBox *createThemeBox() const;
- QComboBox *createAnimationBox() const;
- QComboBox *createLegendBox() const;
- void connectSignals();
- QChart *createAreaChart() const;
- QChart *createBarChart(int valueCount) const;
- QChart *createPieChart() const;
- QChart *createLineChart() const;
- QChart *createSplineChart() const;
- QChart *createScatterChart() const;
-
-private:
- int m_listCount;
- int m_valueMax;
- int m_valueCount;
- QList<QChartView *> m_charts;
- DataTable m_dataTable;
-
- QComboBox *m_themeComboBox;
- QCheckBox *m_antialiasCheckBox;
- QComboBox *m_animatedComboBox;
- QComboBox *m_legendComboBox;
-};
-
-#endif /* THEMEWIDGET_H */
diff --git a/demos/demos.pri b/demos/demos.pri
deleted file mode 100644
index e96d687c..00000000
--- a/demos/demos.pri
+++ /dev/null
@@ -1,39 +0,0 @@
-!include( ../config.pri ) {
- error( "Couldn't find the config.pri file!" )
-}
-
-DESTDIR = $$CHART_BUILD_BIN_DIR
-!ios {
-OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
-MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
-UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
-RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
-}
-TEMPLATE = app
-QT += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-# staticlib config causes problems when building executables
-staticlib: CONFIG-=staticlib
-
-android {
- # Workaround to fix android deployment, which seems to always look for target in
- # OUT_PWD instead of DESTDIR.
- COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so"
- contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\")
- QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS
-
- contains(TARGET, qml.*) {
- charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir
- charts_qmldir.path = /assets/imports/QtCommercial/Chart
- charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so
- charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
- INSTALLS += charts_qmldir charts_qmlplugin
- } else:contains(TARGET, quick2.*) {
- charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir
- charts_qmldir.path = /assets/qml/QtCommercial/Chart
- charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so
- charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH
- INSTALLS += charts_qmldir charts_qmlplugin
- }
-}
diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index 98937905..00000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-CURRENTLY_BUILDING_COMPONENTS = "demos"
-!include( ../config.pri ) {
- error( "Couldn't find the config.pri file!" )
-}
-
-TEMPLATE = subdirs
-SUBDIRS += piechartcustomization \
- dynamicspline \
- nesteddonuts \
- chartinteractions \
- callout \
- chartthemes
-
-!contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) {
- SUBDIRS += qmlchart \
- qmlweather \
- qmlf1legends \
- qmlcustomizations \
- qmlaxes \
- qmlcustomlegend \
- qmlpolarchart \
- qmloscilloscope
-}
-
-contains(QT_CONFIG, multimedia) {
- SUBDIRS += audio
-} else {
- message("QtMultimedia library not available. Some demos are disabled")
-}
-
-contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
- SUBDIRS += quick2chart \
- quick2oscilloscope
-}
diff --git a/demos/dynamicspline/chart.h b/demos/dynamicspline/chart.h
deleted file mode 100644
index 2908310f..00000000
--- a/demos/dynamicspline/chart.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CHART_H
-#define CHART_H
-
-#include <QChart>
-#include <QTimer>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QSplineSeries;
-class QValueAxis;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-//![1]
-class Chart: public QChart
-{
- Q_OBJECT
-public:
- Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
- virtual ~Chart();
-
-public slots:
- void handleTimeout();
-
-private:
- QTimer m_timer;
- QSplineSeries *m_series;
- QStringList m_titles;
- QValueAxis *m_axis;
- qreal m_step;
- qreal m_x;
- qreal m_y;
-};
-//![1]
-
-#endif /* CHART_H */
diff --git a/demos/dynamicspline/dynamicspline.pro b/demos/dynamicspline/dynamicspline.pro
deleted file mode 100644
index 697a864e..00000000
--- a/demos/dynamicspline/dynamicspline.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-TARGET = dynamicspline
-HEADERS += chart.h
-SOURCES += main.cpp chart.cpp
diff --git a/demos/dynamicspline/main.cpp b/demos/dynamicspline/main.cpp
deleted file mode 100644
index 326e635d..00000000
--- a/demos/dynamicspline/main.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "chart.h"
-#include <QChartView>
-#include <QApplication>
-#include <QMainWindow>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- QMainWindow window;
- Chart *chart = new Chart;
- chart->setTitle("Dynamic spline chart");
- chart->legend()->hide();
- chart->setAnimationOptions(QChart::AllAnimations);
- QChartView chartView(chart);
- chartView.setRenderHint(QPainter::Antialiasing);
- window.setCentralWidget(&chartView);
- window.resize(400, 300);
- window.show();
- return a.exec();
-}
diff --git a/demos/nesteddonuts/nesteddonuts.pro b/demos/nesteddonuts/nesteddonuts.pro
deleted file mode 100644
index 2da71e11..00000000
--- a/demos/nesteddonuts/nesteddonuts.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-TARGET = nesteddonuts
-SOURCES += main.cpp\
- widget.cpp
-HEADERS += widget.h
diff --git a/demos/nesteddonuts/widget.cpp b/demos/nesteddonuts/widget.cpp
deleted file mode 100644
index fdde6a64..00000000
--- a/demos/nesteddonuts/widget.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "widget.h"
-#include <QChartView>
-#include <QChart>
-#include <QLegend>
-#include <QPieSeries>
-#include <QPieSlice>
-#include <QTime>
-#include <QGridLayout>
-#include <QTimer>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-Widget::Widget(QWidget *parent)
- : QWidget(parent)
-{
- setMinimumSize(800, 600);
- qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
-
- //! [1]
- QChartView *chartView = new QChartView;
- chartView->setRenderHint(QPainter::Antialiasing);
- QChart *chart = chartView->chart();
- chart->legend()->setVisible(false);
- chart->setTitle("Nested donuts demo");
- chart->setAnimationOptions(QChart::AllAnimations);
- //! [1]
-
- //! [2]
- qreal minSize = 0.1;
- qreal maxSize = 0.9;
- int donutCount = 5;
- //! [2]
-
- //! [3]
- for (int i = 0; i < donutCount; i++) {
- QPieSeries *donut = new QPieSeries;
- int sliceCount = 3 + qrand() % 3;
- for (int j = 0; j < sliceCount; j++) {
- qreal value = 100 + qrand() % 100;
- QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value);
- slice->setLabelVisible(true);
- slice->setLabelColor(Qt::white);
- slice->setLabelPosition(QPieSlice::LabelInsideTangential);
- connect(slice, SIGNAL(hovered(bool)), this, SLOT(explodeSlice(bool)));
- donut->append(slice);
- donut->setHoleSize(minSize + i * (maxSize - minSize) / donutCount);
- donut->setPieSize(minSize + (i + 1) * (maxSize - minSize) / donutCount);
- }
- m_donuts.append(donut);
- chartView->chart()->addSeries(donut);
- }
- //! [3]
-
- // create main layout
- //! [4]
- QGridLayout *mainLayout = new QGridLayout;
- mainLayout->addWidget(chartView, 1, 1);
- setLayout(mainLayout);
- //! [4]
-
- //! [5]
- updateTimer = new QTimer(this);
- connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateRotation()));
- updateTimer->start(1250);
- //! [5]
-}
-
-Widget::~Widget()
-{
-
-}
-
-//! [6]
-void Widget::updateRotation()
-{
- for (int i = 0; i < m_donuts.count(); i++) {
- QPieSeries *donut = m_donuts.at(i);
- qreal phaseShift = -50 + qrand() % 100;
- donut->setPieStartAngle(donut->pieStartAngle() + phaseShift);
- donut->setPieEndAngle(donut->pieEndAngle() + phaseShift);
- }
-}
-//! [6]
-
-//! [7]
-void Widget::explodeSlice(bool exploded)
-{
- QPieSlice *slice = qobject_cast<QPieSlice *>(sender());
- if (exploded) {
- updateTimer->stop();
- qreal sliceStartAngle = slice->startAngle();
- qreal sliceEndAngle = slice->startAngle() + slice->angleSpan();
-
- QPieSeries *donut = slice->series();
- qreal seriesIndex = m_donuts.indexOf(donut);
- for (int i = seriesIndex + 1; i < m_donuts.count(); i++) {
- m_donuts.at(i)->setPieStartAngle(sliceEndAngle);
- m_donuts.at(i)->setPieEndAngle(360 + sliceStartAngle);
- }
- } else {
- for (int i = 0; i < m_donuts.count(); i++) {
- m_donuts.at(i)->setPieStartAngle(0);
- m_donuts.at(i)->setPieEndAngle(360);
- }
- updateTimer->start();
- }
- slice->setExploded(exploded);
-}
-//! [7]
diff --git a/demos/nesteddonuts/widget.h b/demos/nesteddonuts/widget.h
deleted file mode 100644
index d9ba46ab..00000000
--- a/demos/nesteddonuts/widget.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef WIDGET_H
-#define WIDGET_H
-
-#include <QWidget>
-#include <QPieSeries>
-
-class QTimer;
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class Widget : public QWidget
-{
- Q_OBJECT
-
-public:
- Widget(QWidget *parent = 0);
- ~Widget();
-
-public slots:
- void updateRotation();
- void explodeSlice(bool exploded);
-
-private:
- QList<QPieSeries *> m_donuts;
- QTimer *updateTimer;
-};
-
-#endif // WIDGET_H
diff --git a/demos/piechartcustomization/customslice.cpp b/demos/piechartcustomization/customslice.cpp
deleted file mode 100644
index 5ccfe53c..00000000
--- a/demos/piechartcustomization/customslice.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "customslice.h"
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-CustomSlice::CustomSlice(QString label, qreal value)
- : QPieSlice(label, value)
-{
- connect(this, SIGNAL(hovered(bool)), this, SLOT(showHighlight(bool)));
-}
-
-QBrush CustomSlice::originalBrush()
-{
- return m_originalBrush;
-}
-
-void CustomSlice::showHighlight(bool show)
-{
- if (show) {
- QBrush brush = this->brush();
- m_originalBrush = brush;
- brush.setColor(brush.color().lighter());
- setBrush(brush);
- } else {
- setBrush(m_originalBrush);
- }
-}
-
-#include "moc_customslice.cpp"
diff --git a/demos/piechartcustomization/customslice.h b/demos/piechartcustomization/customslice.h
deleted file mode 100644
index 61ae8630..00000000
--- a/demos/piechartcustomization/customslice.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef CUSTOMSLICE_H
-#define CUSTOMSLICE_H
-
-#include <QPieSlice>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class CustomSlice : public QPieSlice
-{
- Q_OBJECT
-
-public:
- CustomSlice(QString label, qreal value);
-
-public:
- QBrush originalBrush();
-
-public Q_SLOTS:
- void showHighlight(bool show);
-
-private:
- QBrush m_originalBrush;
-};
-
-#endif // CUSTOMSLICE_H
diff --git a/demos/piechartcustomization/mainwidget.cpp b/demos/piechartcustomization/mainwidget.cpp
deleted file mode 100644
index b984ba55..00000000
--- a/demos/piechartcustomization/mainwidget.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "mainwidget.h"
-#include "customslice.h"
-#include "pentool.h"
-#include "brushtool.h"
-#include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QDoubleSpinBox>
-#include <QFormLayout>
-#include <QFontDialog>
-#include <QChartView>
-#include <QPieSeries>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-MainWidget::MainWidget(QWidget *parent)
- : QWidget(parent),
- m_slice(0)
-{
- // create chart
- QChart *chart = new QChart;
- chart->setTitle("Piechart customization");
- chart->setAnimationOptions(QChart::AllAnimations);
-
- // create series
- m_series = new QPieSeries();
- *m_series << new CustomSlice("Slice 1", 10.0);
- *m_series << new CustomSlice("Slice 2", 20.0);
- *m_series << new CustomSlice("Slice 3", 30.0);
- *m_series << new CustomSlice("Slice 4", 40.0);
- *m_series << new CustomSlice("Slice 5", 50.0);
- m_series->setLabelsVisible();
- chart->addSeries(m_series);
-
- connect(m_series, SIGNAL(clicked(QPieSlice*)), this, SLOT(handleSliceClicked(QPieSlice*)));
-
- // chart settings
- m_themeComboBox = new QComboBox();
- m_themeComboBox->addItem("Light", QChart::ChartThemeLight);
- m_themeComboBox->addItem("BlueCerulean", QChart::ChartThemeBlueCerulean);
- m_themeComboBox->addItem("Dark", QChart::ChartThemeDark);
- m_themeComboBox->addItem("BrownSand", QChart::ChartThemeBrownSand);
- m_themeComboBox->addItem("BlueNcs", QChart::ChartThemeBlueNcs);
- m_themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast);
- m_themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy);
- m_themeComboBox->addItem("Qt", QChart::ChartThemeQt);
-
- m_aaCheckBox = new QCheckBox();
- m_animationsCheckBox = new QCheckBox();
- m_animationsCheckBox->setCheckState(Qt::Checked);
-
- m_legendCheckBox = new QCheckBox();
-
- QFormLayout *chartSettingsLayout = new QFormLayout();
- chartSettingsLayout->addRow("Theme", m_themeComboBox);
- chartSettingsLayout->addRow("Antialiasing", m_aaCheckBox);
- chartSettingsLayout->addRow("Animations", m_animationsCheckBox);
- chartSettingsLayout->addRow("Legend", m_legendCheckBox);
- QGroupBox *chartSettings = new QGroupBox("Chart");
- chartSettings->setLayout(chartSettingsLayout);
-
- connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateChartSettings()));
- connect(m_aaCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateChartSettings()));
- connect(m_animationsCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateChartSettings()));
- connect(m_legendCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateChartSettings()));
-
- // series settings
- m_hPosition = new QDoubleSpinBox();
- m_hPosition->setMinimum(0.0);
- m_hPosition->setMaximum(1.0);
- m_hPosition->setSingleStep(0.1);
- m_hPosition->setValue(m_series->horizontalPosition());
-
- m_vPosition = new QDoubleSpinBox();
- m_vPosition->setMinimum(0.0);
- m_vPosition->setMaximum(1.0);
- m_vPosition->setSingleStep(0.1);
- m_vPosition->setValue(m_series->verticalPosition());
-
- m_sizeFactor = new QDoubleSpinBox();
- m_sizeFactor->setMinimum(0.0);
- m_sizeFactor->setMaximum(1.0);
- m_sizeFactor->setSingleStep(0.1);
- m_sizeFactor->setValue(m_series->pieSize());
-
- m_startAngle = new QDoubleSpinBox();
- m_startAngle->setMinimum(-720);
- m_startAngle->setMaximum(720);
- m_startAngle->setValue(m_series->pieStartAngle());
- m_startAngle->setSingleStep(1);
-
- m_endAngle = new QDoubleSpinBox();
- m_endAngle->setMinimum(-720);
- m_endAngle->setMaximum(720);
- m_endAngle->setValue(m_series->pieEndAngle());
- m_endAngle->setSingleStep(1);
-
- m_holeSize = new QDoubleSpinBox();
- m_holeSize->setMinimum(0.0);
- m_holeSize->setMaximum(1.0);
- m_holeSize->setSingleStep(0.1);
- m_holeSize->setValue(m_series->holeSize());
-
- QPushButton *appendSlice = new QPushButton("Append slice");
- QPushButton *insertSlice = new QPushButton("Insert slice");
- QPushButton *removeSlice = new QPushButton("Remove selected slice");
-
- QFormLayout *seriesSettingsLayout = new QFormLayout();
- seriesSettingsLayout->addRow("Horizontal position", m_hPosition);
- seriesSettingsLayout->addRow("Vertical position", m_vPosition);
- seriesSettingsLayout->addRow("Size factor", m_sizeFactor);
- seriesSettingsLayout->addRow("Start angle", m_startAngle);
- seriesSettingsLayout->addRow("End angle", m_endAngle);
- seriesSettingsLayout->addRow("Hole size", m_holeSize);
- seriesSettingsLayout->addRow(appendSlice);
- seriesSettingsLayout->addRow(insertSlice);
- seriesSettingsLayout->addRow(removeSlice);
- QGroupBox *seriesSettings = new QGroupBox("Series");
- seriesSettings->setLayout(seriesSettingsLayout);
-
- connect(m_vPosition, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(m_hPosition, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(m_sizeFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(m_startAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(m_endAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(m_holeSize, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
- connect(appendSlice, SIGNAL(clicked()), this, SLOT(appendSlice()));
- connect(insertSlice, SIGNAL(clicked()), this, SLOT(insertSlice()));
- connect(removeSlice, SIGNAL(clicked()), this, SLOT(removeSlice()));
-
- // slice settings
- m_sliceName = new QLineEdit("<click a slice>");
- m_sliceName->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
- m_sliceValue = new QDoubleSpinBox();
- m_sliceValue->setMaximum(1000);
- m_sliceLabelVisible = new QCheckBox();
- m_sliceLabelArmFactor = new QDoubleSpinBox();
- m_sliceLabelArmFactor->setSingleStep(0.01);
- m_sliceExploded = new QCheckBox();
- m_sliceExplodedFactor = new QDoubleSpinBox();
- m_sliceExplodedFactor->setSingleStep(0.01);
- m_pen = new QPushButton();
- m_penTool = new PenTool("Slice pen", this);
- m_brush = new QPushButton();
- m_brushTool = new BrushTool("Slice brush", this);
- m_font = new QPushButton();
- m_labelBrush = new QPushButton();
- m_labelBrushTool = new BrushTool("Label brush", this);
- m_labelPosition = new QComboBox(this);
- m_labelPosition->addItem("Outside", QPieSlice::LabelOutside);
- m_labelPosition->addItem("Inside horizontal", QPieSlice::LabelInsideHorizontal);
- m_labelPosition->addItem("Inside tangential", QPieSlice::LabelInsideTangential);
- m_labelPosition->addItem("Inside normal", QPieSlice::LabelInsideNormal);
-
- QFormLayout *sliceSettingsLayout = new QFormLayout();
- sliceSettingsLayout->addRow("Label", m_sliceName);
- sliceSettingsLayout->addRow("Value", m_sliceValue);
- sliceSettingsLayout->addRow("Pen", m_pen);
- sliceSettingsLayout->addRow("Brush", m_brush);
- sliceSettingsLayout->addRow("Label visible", m_sliceLabelVisible);
- sliceSettingsLayout->addRow("Label font", m_font);
- sliceSettingsLayout->addRow("Label brush", m_labelBrush);
- sliceSettingsLayout->addRow("Label position", m_labelPosition);
- sliceSettingsLayout->addRow("Label arm length", m_sliceLabelArmFactor);
- sliceSettingsLayout->addRow("Exploded", m_sliceExploded);
- sliceSettingsLayout->addRow("Explode distance", m_sliceExplodedFactor);
- QGroupBox *sliceSettings = new QGroupBox("Selected slice");
- sliceSettings->setLayout(sliceSettingsLayout);
-
- connect(m_sliceName, SIGNAL(textChanged(QString)), this, SLOT(updateSliceSettings()));
- connect(m_sliceValue, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
- connect(m_pen, SIGNAL(clicked()), m_penTool, SLOT(show()));
- connect(m_penTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
- connect(m_brush, SIGNAL(clicked()), m_brushTool, SLOT(show()));
- connect(m_brushTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
- connect(m_font, SIGNAL(clicked()), this, SLOT(showFontDialog()));
- connect(m_labelBrush, SIGNAL(clicked()), m_labelBrushTool, SLOT(show()));
- connect(m_labelBrushTool, SIGNAL(changed()), this, SLOT(updateSliceSettings()));
- connect(m_sliceLabelVisible, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
- connect(m_sliceLabelVisible, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
- connect(m_sliceLabelArmFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
- connect(m_sliceExploded, SIGNAL(toggled(bool)), this, SLOT(updateSliceSettings()));
- connect(m_sliceExplodedFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSliceSettings()));
- connect(m_labelPosition, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSliceSettings()));
-
- // create chart view
- m_chartView = new QChartView(chart);
-
- // create main layout
- QVBoxLayout *settingsLayout = new QVBoxLayout();
- settingsLayout->addWidget(chartSettings);
- settingsLayout->addWidget(seriesSettings);
- settingsLayout->addWidget(sliceSettings);
- settingsLayout->addStretch();
-
- QGridLayout *baseLayout = new QGridLayout();
- baseLayout->addLayout(settingsLayout, 0, 0);
- baseLayout->addWidget(m_chartView, 0, 1);
- setLayout(baseLayout);
-
- updateSerieSettings();
- updateChartSettings();
-}
-
-
-void MainWidget::updateChartSettings()
-{
- QChart::ChartTheme theme = (QChart::ChartTheme) m_themeComboBox->itemData(m_themeComboBox->currentIndex()).toInt();
- m_chartView->chart()->setTheme(theme);
- m_chartView->setRenderHint(QPainter::Antialiasing, m_aaCheckBox->isChecked());
-
- if (m_animationsCheckBox->checkState() == Qt::Checked)
- m_chartView->chart()->setAnimationOptions(QChart::AllAnimations);
- else
- m_chartView->chart()->setAnimationOptions(QChart::NoAnimation);
-
- if (m_legendCheckBox->checkState() == Qt::Checked)
- m_chartView->chart()->legend()->show();
- else
- m_chartView->chart()->legend()->hide();
-}
-
-void MainWidget::updateSerieSettings()
-{
- m_series->setHorizontalPosition(m_hPosition->value());
- m_series->setVerticalPosition(m_vPosition->value());
- m_series->setPieSize(m_sizeFactor->value());
- m_holeSize->setMaximum(m_sizeFactor->value());
- m_series->setPieStartAngle(m_startAngle->value());
- m_series->setPieEndAngle(m_endAngle->value());
- m_series->setHoleSize(m_holeSize->value());
-}
-
-void MainWidget::updateSliceSettings()
-{
- if (!m_slice)
- return;
-
- m_slice->setLabel(m_sliceName->text());
-
- m_slice->setValue(m_sliceValue->value());
-
- m_slice->setPen(m_penTool->pen());
- m_slice->setBrush(m_brushTool->brush());
-
- m_slice->setLabelBrush(m_labelBrushTool->brush());
- m_slice->setLabelVisible(m_sliceLabelVisible->isChecked());
- m_slice->setLabelArmLengthFactor(m_sliceLabelArmFactor->value());
- m_slice->setLabelPosition((QPieSlice::LabelPosition)m_labelPosition->currentIndex()); // assumes that index is in sync with the enum
-
- m_slice->setExploded(m_sliceExploded->isChecked());
- m_slice->setExplodeDistanceFactor(m_sliceExplodedFactor->value());
-}
-
-void MainWidget::handleSliceClicked(QPieSlice *slice)
-{
- m_slice = static_cast<CustomSlice *>(slice);
-
- // name
- m_sliceName->blockSignals(true);
- m_sliceName->setText(slice->label());
- m_sliceName->blockSignals(false);
-
- // value
- m_sliceValue->blockSignals(true);
- m_sliceValue->setValue(slice->value());
- m_sliceValue->blockSignals(false);
-
- // pen
- m_pen->setText(PenTool::name(m_slice->pen()));
- m_penTool->setPen(m_slice->pen());
-
- // brush
- m_brush->setText(m_slice->originalBrush().color().name());
- m_brushTool->setBrush(m_slice->originalBrush());
-
- // label
- m_labelBrush->setText(BrushTool::name(m_slice->labelBrush()));
- m_labelBrushTool->setBrush(m_slice->labelBrush());
- m_font->setText(slice->labelFont().toString());
- m_sliceLabelVisible->blockSignals(true);
- m_sliceLabelVisible->setChecked(slice->isLabelVisible());
- m_sliceLabelVisible->blockSignals(false);
- m_sliceLabelArmFactor->blockSignals(true);
- m_sliceLabelArmFactor->setValue(slice->labelArmLengthFactor());
- m_sliceLabelArmFactor->blockSignals(false);
- m_labelPosition->blockSignals(true);
- m_labelPosition->setCurrentIndex(slice->labelPosition()); // assumes that index is in sync with the enum
- m_labelPosition->blockSignals(false);
-
- // exploded
- m_sliceExploded->blockSignals(true);
- m_sliceExploded->setChecked(slice->isExploded());
- m_sliceExploded->blockSignals(false);
- m_sliceExplodedFactor->blockSignals(true);
- m_sliceExplodedFactor->setValue(slice->explodeDistanceFactor());
- m_sliceExplodedFactor->blockSignals(false);
-}
-
-void MainWidget::showFontDialog()
-{
- if (!m_slice)
- return;
-
- QFontDialog dialog(m_slice->labelFont());
- dialog.show();
- dialog.exec();
-
- m_slice->setLabelFont(dialog.currentFont());
- m_font->setText(dialog.currentFont().toString());
-}
-
-void MainWidget::appendSlice()
-{
- *m_series << new CustomSlice("Slice " + QString::number(m_series->count() + 1), 10.0);
-}
-
-void MainWidget::insertSlice()
-{
- if (!m_slice)
- return;
-
- int i = m_series->slices().indexOf(m_slice);
-
- m_series->insert(i, new CustomSlice("Slice " + QString::number(m_series->count() + 1), 10.0));
-}
-
-void MainWidget::removeSlice()
-{
- if (!m_slice)
- return;
-
- m_sliceName->setText("<click a slice>");
-
- m_series->remove(m_slice);
- m_slice = 0;
-}
-
-#include "moc_mainwidget.cpp"
diff --git a/demos/piechartcustomization/mainwidget.h b/demos/piechartcustomization/mainwidget.h
deleted file mode 100644
index 07fcd034..00000000
--- a/demos/piechartcustomization/mainwidget.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef MAINWIDGET_H
-#define MAINWIDGET_H
-
-#include <QWidget>
-#include <QChartGlobal>
-
-class QLineEdit;
-class QPushButton;
-class QCheckBox;
-class QComboBox;
-class QDoubleSpinBox;
-class PenTool;
-class BrushTool;
-class CustomSlice;
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-class QChartView;
-class QPieSeries;
-class QPieSlice;
-QTCOMMERCIALCHART_END_NAMESPACE
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-class MainWidget : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit MainWidget(QWidget *parent = 0);
-
-public Q_SLOTS:
- void updateChartSettings();
- void updateSerieSettings();
- void updateSliceSettings();
- void handleSliceClicked(QPieSlice *slice);
- void showFontDialog();
- void appendSlice();
- void insertSlice();
- void removeSlice();
-
-private:
- QComboBox *m_themeComboBox;
- QCheckBox *m_aaCheckBox;
- QCheckBox *m_animationsCheckBox;
- QCheckBox *m_legendCheckBox;
-
- QChartView *m_chartView;
- QPieSeries *m_series;
- CustomSlice *m_slice;
-
- QDoubleSpinBox *m_hPosition;
- QDoubleSpinBox *m_vPosition;
- QDoubleSpinBox *m_sizeFactor;
- QDoubleSpinBox *m_startAngle;
- QDoubleSpinBox *m_endAngle;
- QDoubleSpinBox *m_holeSize;
-
- QLineEdit *m_sliceName;
- QDoubleSpinBox *m_sliceValue;
- QCheckBox *m_sliceLabelVisible;
- QDoubleSpinBox *m_sliceLabelArmFactor;
- QCheckBox *m_sliceExploded;
- QDoubleSpinBox *m_sliceExplodedFactor;
- QPushButton *m_brush;
- BrushTool *m_brushTool;
- QPushButton *m_pen;
- PenTool *m_penTool;
- QPushButton *m_font;
- QPushButton *m_labelBrush;
- QComboBox *m_labelPosition;
- BrushTool *m_labelBrushTool;
-};
-
-#endif // MAINWIDGET_H
diff --git a/demos/piechartcustomization/piechartcustomization.pro b/demos/piechartcustomization/piechartcustomization.pro
deleted file mode 100644
index 9698b487..00000000
--- a/demos/piechartcustomization/piechartcustomization.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-TARGET = piechartcustomization
-SOURCES += main.cpp \
- pentool.cpp \
- brushtool.cpp \
- customslice.cpp \
- mainwidget.cpp
-
-HEADERS += \
- pentool.h \
- brushtool.h \
- customslice.h \
- mainwidget.h
diff --git a/demos/qmlaxes/main.cpp b/demos/qmlaxes/main.cpp
deleted file mode 100644
index 9ce94bcc..00000000
--- a/demos/qmlaxes/main.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QDir>
-#include "qmlapplicationviewer.h"
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
- QScopedPointer<QApplication> app(createApplication(argc, argv));
- QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-#ifdef Q_OS_ANDROID
- viewer->addImportPath(QString::fromLatin1("assets:/imports"));
- viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
- viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
- // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer->setSource(QUrl("qrc:/qml/qmlaxes/loader.qml"));
- viewer->setRenderHint(QPainter::Antialiasing, true);
- viewer->showExpanded();
-
- return app->exec();
-}
diff --git a/demos/qmlaxes/qml/qmlaxes/View1.qml b/demos/qmlaxes/qml/qmlaxes/View1.qml
deleted file mode 100644
index 7ee15f61..00000000
--- a/demos/qmlaxes/qml/qmlaxes/View1.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Two Series, Common Axes"
- anchors.fill: parent
- legend.visible: false
-
- ValueAxis {
- id: axisX
- min: 0
- max: 10
- tickCount: 5
- }
-
- ValueAxis {
- id: axisY
- min: -0.5
- max: 1.5
- }
-
- LineSeries {
- id: series1
- axisX: axisX
- axisY: axisY
- }
-
- ScatterSeries {
- id: series2
- axisX: axisX
- axisY: axisY
- }
- }
-
- // Add data dynamically to the series
- Component.onCompleted: {
- for (var i = 0; i <= 10; i++) {
- series1.append(i, Math.random());
- series2.append(i, Math.random());
- }
- }
- //![1]
-}
diff --git a/demos/qmlaxes/qml/qmlaxes/View2.qml b/demos/qmlaxes/qml/qmlaxes/View2.qml
deleted file mode 100644
index bba5aaa6..00000000
--- a/demos/qmlaxes/qml/qmlaxes/View2.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Accurate Historical Data"
- anchors.fill: parent
- legend.visible: false
-
- LineSeries {
- axisX: DateTimeAxis {
- format: "yyyy MMM"
- tickCount: 5
- }
- axisY: ValueAxis {
- min: 0
- max: 150
- }
-
- // Please note that month in JavaScript months are zero based, so 2 means March
- XYPoint { x: toMsecsSinceEpoch(new Date(1950, 2, 15)); y: 5 }
- XYPoint { x: toMsecsSinceEpoch(new Date(1970, 0, 1)); y: 50 }
- XYPoint { x: toMsecsSinceEpoch(new Date(1987, 12, 31)); y: 102 }
- XYPoint { x: toMsecsSinceEpoch(new Date(1998, 7, 1)); y: 100 }
- XYPoint { x: toMsecsSinceEpoch(new Date(2012, 8, 2)); y: 110 }
- }
- }
-
- // DateTimeAxis is based on QDateTimes so we must convert our JavaScript dates to
- // milliseconds since epoch to make them match the DateTimeAxis values
- function toMsecsSinceEpoch(date) {
- var msecs = date.getTime();
- return msecs;
- }
- //![1]
-}
diff --git a/demos/qmlaxes/qml/qmlaxes/View3.qml b/demos/qmlaxes/qml/qmlaxes/View3.qml
deleted file mode 100644
index 2985fef7..00000000
--- a/demos/qmlaxes/qml/qmlaxes/View3.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Numerical Data for Dummies"
- anchors.fill: parent
- legend.visible: false
-
- LineSeries {
- axisY: CategoryAxis {
- min: 0
- max: 30
- CategoryRange {
- label: "critical"
- endValue: 2
- }
- CategoryRange {
- label: "low"
- endValue: 4
- }
- CategoryRange {
- label: "normal"
- endValue: 7
- }
- CategoryRange {
- label: "high"
- endValue: 15
- }
- CategoryRange {
- label: "extremely high"
- endValue: 30
- }
- }
-
- XYPoint { x: 0; y: 4.3 }
- XYPoint { x: 1; y: 4.1 }
- XYPoint { x: 2; y: 4.7 }
- XYPoint { x: 3; y: 3.9 }
- XYPoint { x: 4; y: 5.2 }
- }
- }
- //![1]
-}
diff --git a/demos/qmlaxes/qml/qmlaxes/loader.qml b/demos/qmlaxes/qml/qmlaxes/loader.qml
deleted file mode 100644
index be6d47b3..00000000
--- a/demos/qmlaxes/qml/qmlaxes/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
- id: container
- width: 440
- height: 340
- Component.onCompleted: {
- var co = Qt.createComponent("main.qml")
- if (co.status == Component.Ready) {
- var o = co.createObject(container)
- } else {
- console.log(co.errorString())
- console.log("QtCommercial.Chart 1.1 not available")
- console.log("Please use correct QML_IMPORT_PATH export")
- }
- }
-}
diff --git a/demos/qmlaxes/qml/qmlaxes/main.qml b/demos/qmlaxes/qml/qmlaxes/main.qml
deleted file mode 100644
index 56f5e288..00000000
--- a/demos/qmlaxes/qml/qmlaxes/main.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
- width: parent.width
- height: parent.height
- property int viewNumber: 1
- property int viewCount: 3
-
- Loader {
- id: loader
- anchors.fill: parent
- source: "View" + viewNumber + ".qml";
- }
-
- Rectangle {
- id: infoText
- anchors.centerIn: parent
- width: parent.width
- height: 40
- color: "black"
- Text {
- color: "white"
- anchors.centerIn: parent
- text: "Use left and right arrow keys to navigate"
- }
-
- Behavior on opacity {
- NumberAnimation { duration: 400 }
- }
- }
-
- MouseArea {
- focus: true
- anchors.fill: parent
- onClicked: {
- if (infoText.opacity > 0) {
- infoText.opacity = 0.0;
- } else {
- nextView();
- }
- }
- Keys.onPressed: {
- if (infoText.opacity > 0) {
- infoText.opacity = 0.0;
- } else {
- if (event.key == Qt.Key_Left) {
- previousView();
- } else {
- nextView();
- }
- }
- }
- }
-
- function nextView() {
- var i = viewNumber + 1;
- if (i > viewCount)
- viewNumber = 1;
- else
- viewNumber = i;
- }
-
- function previousView() {
- var i = viewNumber - 1;
- if (i <= 0)
- viewNumber = viewCount;
- else
- viewNumber = i;
- }
-}
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb227056..00000000
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
- QmlJsDebuggingEnabler()
- {
- QDeclarativeDebugHelper::enableDebugging();
- }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
- QString mainQmlFile;
- friend class QmlApplicationViewer;
- static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("%1/../Resources/%2")
- .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
- QString pathInInstallDir =
- QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
- pathInInstallDir =
- QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
-#endif
- return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
- : QDeclarativeView(parent)
- , d(new QmlApplicationViewerPrivate())
-{
- connect(engine(), SIGNAL(quit()), SLOT(close()));
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
- // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
- new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
- new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
- delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
- return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
- d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
- setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
- setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
- engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
- Qt::WidgetAttribute attribute;
- switch (orientation) {
-#if QT_VERSION < 0x040702
- // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
- case ScreenOrientationLockPortrait:
- attribute = static_cast<Qt::WidgetAttribute>(128);
- break;
- case ScreenOrientationLockLandscape:
- attribute = static_cast<Qt::WidgetAttribute>(129);
- break;
- default:
- case ScreenOrientationAuto:
- attribute = static_cast<Qt::WidgetAttribute>(130);
- break;
-#else // QT_VERSION < 0x040702
- case ScreenOrientationLockPortrait:
- attribute = Qt::WA_LockPortraitOrientation;
- break;
- case ScreenOrientationLockLandscape:
- attribute = Qt::WA_LockLandscapeOrientation;
- break;
- default:
- case ScreenOrientationAuto:
- attribute = Qt::WA_AutoOrientation;
- break;
-#endif // QT_VERSION < 0x040702
- };
- setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
- Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
- showMaximized();
-#else
- show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
- return MDeclarativeCache::qApplication(argc, argv);
-#else
- return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232f..00000000
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
- Q_OBJECT
-
-public:
- enum ScreenOrientation {
- ScreenOrientationLockPortrait,
- ScreenOrientationLockLandscape,
- ScreenOrientationAuto
- };
-
- explicit QmlApplicationViewer(QWidget *parent = 0);
- virtual ~QmlApplicationViewer();
-
- static QmlApplicationViewer *create();
-
- void setMainQmlFile(const QString &file);
- void addImportPath(const QString &path);
-
- // Note that this will only have an effect on Fremantle.
- void setOrientation(ScreenOrientation orientation);
-
- void showExpanded();
-
-private:
- class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc6..00000000
--- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlaxes/qmlaxes.pro b/demos/qmlaxes/qmlaxes.pro
deleted file mode 100644
index 3e1a0954..00000000
--- a/demos/qmlaxes/qmlaxes.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp
-OTHER_FILES += qml/qmlaxes/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmlaxes/resources.qrc b/demos/qmlaxes/resources.qrc
deleted file mode 100644
index 29e173d4..00000000
--- a/demos/qmlaxes/resources.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>qml/qmlaxes/loader.qml</file>
- <file>qml/qmlaxes/main.qml</file>
- <file>qml/qmlaxes/View1.qml</file>
- <file>qml/qmlaxes/View2.qml</file>
- <file>qml/qmlaxes/View3.qml</file>
- </qresource>
-</RCC>
diff --git a/demos/qmlchart/main.cpp b/demos/qmlchart/main.cpp
deleted file mode 100644
index dbf65620..00000000
--- a/demos/qmlchart/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QDir>
-#include "qmlapplicationviewer.h"
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
- QScopedPointer<QApplication> app(createApplication(argc, argv));
- QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-#ifdef Q_OS_ANDROID
- viewer->addImportPath(QString::fromLatin1("assets:/imports"));
- viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
- viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
-
- // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer->setSource(QUrl("qrc:/qml/qmlchart/loader.qml"));
- viewer->setRenderHint(QPainter::Antialiasing, true);
- viewer->showExpanded();
-
- return app->exec();
-}
diff --git a/demos/qmlchart/qml/qmlchart/View1.qml b/demos/qmlchart/qml/qmlchart/View1.qml
deleted file mode 100644
index c2409ec9..00000000
--- a/demos/qmlchart/qml/qmlchart/View1.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
- property variant othersSlice: 0
-
- //![1]
- ChartView {
- id: chart
- title: "Top-5 car brand shares in Finland"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- PieSeries {
- id: pieSeries
- PieSlice { label: "Volkswagen"; value: 13.5 }
- PieSlice { label: "Toyota"; value: 10.9 }
- PieSlice { label: "Ford"; value: 8.6 }
- PieSlice { label: "Skoda"; value: 8.2 }
- PieSlice { label: "Volvo"; value: 6.8 }
- }
- }
-
- Component.onCompleted: {
- // You can also manipulate slices dynamically
- othersSlice = pieSeries.append("Others", 52.0);
- pieSeries.find("Volkswagen").exploded = true;
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View10.qml b/demos/qmlchart/qml/qmlchart/View10.qml
deleted file mode 100644
index 4fef2052..00000000
--- a/demos/qmlchart/qml/qmlchart/View10.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Horizontal Stacked Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- HorizontalStackedBarSeries {
- axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View11.qml b/demos/qmlchart/qml/qmlchart/View11.qml
deleted file mode 100644
index 2799d3ea..00000000
--- a/demos/qmlchart/qml/qmlchart/View11.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Horizontal Percent Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- HorizontalPercentBarSeries {
- axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
-
diff --git a/demos/qmlchart/qml/qmlchart/View12.qml b/demos/qmlchart/qml/qmlchart/View12.qml
deleted file mode 100644
index ce2d7373..00000000
--- a/demos/qmlchart/qml/qmlchart/View12.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- id: chart
- title: "Production costs"
- anchors.fill: parent
- legend.visible: false
-
- PieSeries {
- id: pieOuter
- size: 0.96
- holeSize: 0.7
- PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" }
- PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" }
- PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" }
- }
-
- PieSeries {
- size: 0.7
- id: pieInner
- holeSize: 0.25
-
- PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" }
- PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" }
- PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" }
-
- PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" }
- PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" }
- PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" }
-
- PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" }
- PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" }
- PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" }
- }
- }
-
- Component.onCompleted: {
- // Set the common slice properties dynamically for convenience
- for (var i = 0; i < pieOuter.count; i++) {
- pieOuter.at(i).labelPosition = PieSlice.LabelOutside;
- pieOuter.at(i).labelVisible = true;
- pieOuter.at(i).borderWidth = 3;
- }
- for (var i = 0; i < pieInner.count; i++) {
- pieInner.at(i).labelPosition = PieSlice.LabelInsideNormal;
- pieInner.at(i).labelVisible = true;
- pieInner.at(i).borderWidth = 2;
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View2.qml b/demos/qmlchart/qml/qmlchart/View2.qml
deleted file mode 100644
index bc96abc7..00000000
--- a/demos/qmlchart/qml/qmlchart/View2.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Line"
- anchors.fill: parent
-
- LineSeries {
- name: "LineSeries"
- XYPoint { x: 0; y: 0 }
- XYPoint { x: 1.1; y: 2.1 }
- XYPoint { x: 1.9; y: 3.3 }
- XYPoint { x: 2.1; y: 2.1 }
- XYPoint { x: 2.9; y: 4.9 }
- XYPoint { x: 3.4; y: 3.0 }
- XYPoint { x: 4.1; y: 3.3 }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View3.qml b/demos/qmlchart/qml/qmlchart/View3.qml
deleted file mode 100644
index 26ac57ce..00000000
--- a/demos/qmlchart/qml/qmlchart/View3.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Spline"
- anchors.fill: parent
-
- SplineSeries {
- name: "SplineSeries"
- XYPoint { x: 0; y: 0.0 }
- XYPoint { x: 1.1; y: 3.2 }
- XYPoint { x: 1.9; y: 2.4 }
- XYPoint { x: 2.1; y: 2.1 }
- XYPoint { x: 2.9; y: 2.6 }
- XYPoint { x: 3.4; y: 2.3 }
- XYPoint { x: 4.1; y: 3.1 }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View4.qml b/demos/qmlchart/qml/qmlchart/View4.qml
deleted file mode 100644
index 32ccb19d..00000000
--- a/demos/qmlchart/qml/qmlchart/View4.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "NHL All-Star Team Players"
- anchors.fill: parent
-
- ValueAxis {
- id: valueAxis
- min: 2000
- max: 2011
- tickCount: 12
- labelFormat: "%.0f"
- }
-
- AreaSeries {
- name: "Russian"
- color: "#FFD52B1E"
- borderColor: "#FF0039A5"
- borderWidth: 3
- axisX: valueAxis
- upperSeries: LineSeries {
- XYPoint { x: 2000; y: 1 }
- XYPoint { x: 2001; y: 1 }
- XYPoint { x: 2002; y: 1 }
- XYPoint { x: 2003; y: 1 }
- XYPoint { x: 2004; y: 1 }
- XYPoint { x: 2005; y: 0 }
- XYPoint { x: 2006; y: 1 }
- XYPoint { x: 2007; y: 1 }
- XYPoint { x: 2008; y: 4 }
- XYPoint { x: 2009; y: 3 }
- XYPoint { x: 2010; y: 2 }
- XYPoint { x: 2011; y: 1 }
- }
- }
- // ...
- //![1]
-
- AreaSeries {
- name: "Swedish"
- color: "#AF005292"
- borderColor: "#AFFDCA00"
- borderWidth: 3
- axisX: valueAxis
- upperSeries: LineSeries {
- XYPoint { x: 2000; y: 1 }
- XYPoint { x: 2001; y: 1 }
- XYPoint { x: 2002; y: 3 }
- XYPoint { x: 2003; y: 3 }
- XYPoint { x: 2004; y: 2 }
- XYPoint { x: 2005; y: 0 }
- XYPoint { x: 2006; y: 2 }
- XYPoint { x: 2007; y: 1 }
- XYPoint { x: 2008; y: 2 }
- XYPoint { x: 2009; y: 1 }
- XYPoint { x: 2010; y: 3 }
- XYPoint { x: 2011; y: 3 }
- }
- }
-
- AreaSeries {
- name: "Finnish"
- color: "#00357F"
- borderColor: "#FEFEFE"
- borderWidth: 3
- axisX: valueAxis
- upperSeries: LineSeries {
- XYPoint { x: 2000; y: 0 }
- XYPoint { x: 2001; y: 0 }
- XYPoint { x: 2002; y: 0 }
- XYPoint { x: 2003; y: 0 }
- XYPoint { x: 2004; y: 0 }
- XYPoint { x: 2005; y: 0 }
- XYPoint { x: 2006; y: 1 }
- XYPoint { x: 2007; y: 0 }
- XYPoint { x: 2008; y: 0 }
- XYPoint { x: 2009; y: 0 }
- XYPoint { x: 2010; y: 0 }
- XYPoint { x: 2011; y: 1 }
- }
- }
- }
-}
diff --git a/demos/qmlchart/qml/qmlchart/View5.qml b/demos/qmlchart/qml/qmlchart/View5.qml
deleted file mode 100644
index 5632b6c4..00000000
--- a/demos/qmlchart/qml/qmlchart/View5.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Scatters"
- anchors.fill: parent
-
- ScatterSeries {
- id: scatter1
- name: "Scatter1"
- XYPoint { x: 1.5; y: 1.5 }
- XYPoint { x: 1.5; y: 1.6 }
- XYPoint { x: 1.57; y: 1.55 }
- XYPoint { x: 1.8; y: 1.8 }
- XYPoint { x: 1.9; y: 1.6 }
- XYPoint { x: 2.1; y: 1.3 }
- XYPoint { x: 2.5; y: 2.1 }
- }
-
- ScatterSeries {
- name: "Scatter2"
- // ...
- //![1]
- XYPoint { x: 2.0; y: 2.0 }
- XYPoint { x: 2.0; y: 2.1 }
- XYPoint { x: 2.07; y: 2.05 }
- XYPoint { x: 2.2; y: 2.9 }
- XYPoint { x: 2.4; y: 2.7 }
- XYPoint { x: 2.67; y: 2.65 }
- }
- }
-}
diff --git a/demos/qmlchart/qml/qmlchart/View6.qml b/demos/qmlchart/qml/qmlchart/View6.qml
deleted file mode 100644
index ff5b3e8b..00000000
--- a/demos/qmlchart/qml/qmlchart/View6.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- BarSeries {
- id: mySeries
- axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View7.qml b/demos/qmlchart/qml/qmlchart/View7.qml
deleted file mode 100644
index 6b86b2c6..00000000
--- a/demos/qmlchart/qml/qmlchart/View7.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Stacked Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- StackedBarSeries {
- id: mySeries
- axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View8.qml b/demos/qmlchart/qml/qmlchart/View8.qml
deleted file mode 100644
index eeb0147a..00000000
--- a/demos/qmlchart/qml/qmlchart/View8.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Percent Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- PercentBarSeries {
- axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
diff --git a/demos/qmlchart/qml/qmlchart/View9.qml b/demos/qmlchart/qml/qmlchart/View9.qml
deleted file mode 100644
index 5df8d52f..00000000
--- a/demos/qmlchart/qml/qmlchart/View9.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- anchors.fill: parent
-
- //![1]
- ChartView {
- title: "Horizontal Bar series"
- anchors.fill: parent
- legend.alignment: Qt.AlignBottom
-
- HorizontalBarSeries {
- axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
- BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
- BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
- BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }
- }
- }
- //![1]
-}
-
diff --git a/demos/qmlchart/qml/qmlchart/loader.qml b/demos/qmlchart/qml/qmlchart/loader.qml
deleted file mode 100644
index 271f1f76..00000000
--- a/demos/qmlchart/qml/qmlchart/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
- id: container
- width: 600
- height: 400
- Component.onCompleted: {
- var co = Qt.createComponent("main.qml")
- if (co.status == Component.Ready) {
- var o = co.createObject(container)
- } else {
- console.log(co.errorString())
- console.log("QtCommercial.Chart 1.1 not available")
- console.log("Please use correct QML_IMPORT_PATH export")
- }
- }
-}
diff --git a/demos/qmlchart/qml/qmlchart/main.qml b/demos/qmlchart/qml/qmlchart/main.qml
deleted file mode 100644
index d4ca8f82..00000000
--- a/demos/qmlchart/qml/qmlchart/main.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
- width: parent.width
- height: parent.height
- property int viewNumber: 1
-
- Loader {
- id: loader
- anchors.fill: parent
- source: "View" + viewNumber + ".qml";
- }
-
- Rectangle {
- id: infoText
- anchors.centerIn: parent
- width: parent.width
- height: 40
- color: "black"
- Text {
- color: "white"
- anchors.centerIn: parent
- text: "Use left and right arrow keys to navigate between chart types"
- }
-
- Behavior on opacity {
- NumberAnimation { duration: 400 }
- }
- }
-
- MouseArea {
- focus: true
- anchors.fill: parent
- onClicked: {
- if (infoText.opacity > 0) {
- infoText.opacity = 0.0;
- } else {
- nextView();
- }
- }
- Keys.onPressed: {
- if (infoText.opacity > 0) {
- infoText.opacity = 0.0;
- } else {
- if (event.key == Qt.Key_Left) {
- previousView();
- } else {
- nextView();
- }
- }
- }
- }
-
- function nextView() {
- var i = viewNumber + 1;
- if (i > 12)
- viewNumber = 1;
- else
- viewNumber = i;
- }
-
- function previousView() {
- var i = viewNumber - 1;
- if (i <= 0)
- viewNumber = 12;
- else
- viewNumber = i;
- }
-}
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb227056..00000000
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
- QmlJsDebuggingEnabler()
- {
- QDeclarativeDebugHelper::enableDebugging();
- }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
- QString mainQmlFile;
- friend class QmlApplicationViewer;
- static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("%1/../Resources/%2")
- .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
- QString pathInInstallDir =
- QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
- pathInInstallDir =
- QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
-#endif
- return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
- : QDeclarativeView(parent)
- , d(new QmlApplicationViewerPrivate())
-{
- connect(engine(), SIGNAL(quit()), SLOT(close()));
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
- // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
- new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
- new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
- delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
- return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
- d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
- setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
- setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
- engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
- Qt::WidgetAttribute attribute;
- switch (orientation) {
-#if QT_VERSION < 0x040702
- // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
- case ScreenOrientationLockPortrait:
- attribute = static_cast<Qt::WidgetAttribute>(128);
- break;
- case ScreenOrientationLockLandscape:
- attribute = static_cast<Qt::WidgetAttribute>(129);
- break;
- default:
- case ScreenOrientationAuto:
- attribute = static_cast<Qt::WidgetAttribute>(130);
- break;
-#else // QT_VERSION < 0x040702
- case ScreenOrientationLockPortrait:
- attribute = Qt::WA_LockPortraitOrientation;
- break;
- case ScreenOrientationLockLandscape:
- attribute = Qt::WA_LockLandscapeOrientation;
- break;
- default:
- case ScreenOrientationAuto:
- attribute = Qt::WA_AutoOrientation;
- break;
-#endif // QT_VERSION < 0x040702
- };
- setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
- Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
- showMaximized();
-#else
- show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
- return MDeclarativeCache::qApplication(argc, argv);
-#else
- return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232f..00000000
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
- Q_OBJECT
-
-public:
- enum ScreenOrientation {
- ScreenOrientationLockPortrait,
- ScreenOrientationLockLandscape,
- ScreenOrientationAuto
- };
-
- explicit QmlApplicationViewer(QWidget *parent = 0);
- virtual ~QmlApplicationViewer();
-
- static QmlApplicationViewer *create();
-
- void setMainQmlFile(const QString &file);
- void addImportPath(const QString &path);
-
- // Note that this will only have an effect on Fremantle.
- void setOrientation(ScreenOrientation orientation);
-
- void showExpanded();
-
-private:
- class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc6..00000000
--- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlchart/qmlchart.pro b/demos/qmlchart/qmlchart.pro
deleted file mode 100644
index f9996cb5..00000000
--- a/demos/qmlchart/qmlchart.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp
-OTHER_FILES += qml/qmlchart/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmlchart/qmlchart.svg b/demos/qmlchart/qmlchart.svg
deleted file mode 100644
index 566acfad..00000000
--- a/demos/qmlchart/qmlchart.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- height="44px"
- version="1.1"
- viewBox="0 0 44 44"
- width="44px"
- x="0px"
- y="0px"
- id="svg2"
- inkscape:version="0.47 r22583"
- sodipodi:docname="qt.svg">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 22 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="44 : 22 : 1"
- inkscape:persp3d-origin="22 : 14.666667 : 1"
- id="perspective2836" />
- </defs>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1020"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="21.454545"
- inkscape:cx="49.412871"
- inkscape:cy="21.894358"
- inkscape:window-x="-4"
- inkscape:window-y="-4"
- inkscape:window-maximized="1"
- inkscape:current-layer="g3" />
- <g
- transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
- id="g3">
- <path
- d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
- style="fill:#006225"
- id="path5"
- sodipodi:nodetypes="cccccccc" />
- <path
- d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
- style="fill:#80c342"
- id="path7" />
- <path
- d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
- style="fill:#006225"
- id="path11" />
- <path
- d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
- style="fill:#006225"
- id="path13" />
- <path
- id="path17"
- style="fill:#ffffff"
- d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
- <path
- d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
- style="fill:#006225"
- id="path19" />
- <path
- id="path21"
- style="fill:#006225"
- d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
- </g>
-</svg>
diff --git a/demos/qmlchart/resources.qrc b/demos/qmlchart/resources.qrc
deleted file mode 100644
index 43b6f8a8..00000000
--- a/demos/qmlchart/resources.qrc
+++ /dev/null
@@ -1,18 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>qml/qmlchart/loader.qml</file>
- <file>qml/qmlchart/main.qml</file>
- <file>qml/qmlchart/View1.qml</file>
- <file>qml/qmlchart/View2.qml</file>
- <file>qml/qmlchart/View3.qml</file>
- <file>qml/qmlchart/View4.qml</file>
- <file>qml/qmlchart/View5.qml</file>
- <file>qml/qmlchart/View6.qml</file>
- <file>qml/qmlchart/View7.qml</file>
- <file>qml/qmlchart/View8.qml</file>
- <file>qml/qmlchart/View9.qml</file>
- <file>qml/qmlchart/View10.qml</file>
- <file>qml/qmlchart/View11.qml</file>
- <file>qml/qmlchart/View12.qml</file>
- </qresource>
-</RCC>
diff --git a/demos/qmlcustomizations/main.cpp b/demos/qmlcustomizations/main.cpp
deleted file mode 100644
index 79424b95..00000000
--- a/demos/qmlcustomizations/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QDir>
-#include "qmlapplicationviewer.h"
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
- QScopedPointer<QApplication> app(createApplication(argc, argv));
- QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-#ifdef Q_OS_ANDROID
- viewer->addImportPath(QString::fromLatin1("assets:/imports"));
- viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
- viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
-
- // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer->setSource(QUrl("qrc:/qml/qmlcustomizations/loader.qml"));
- viewer->setRenderHint(QPainter::Antialiasing, true);
- viewer->showExpanded();
-
- return app->exec();
-}
diff --git a/demos/qmlcustomizations/qml/qmlcustomizations/loader.qml b/demos/qmlcustomizations/qml/qmlcustomizations/loader.qml
deleted file mode 100644
index c3eea330..00000000
--- a/demos/qmlcustomizations/qml/qmlcustomizations/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
- id: container
- width: 400
- height: 300
- Component.onCompleted: {
- var co = Qt.createComponent("main.qml")
- if (co.status == Component.Ready) {
- var o = co.createObject(container)
- } else {
- console.log(co.errorString())
- console.log("QtCommercial.Chart 1.1 not available")
- console.log("Please use correct QML_IMPORT_PATH export")
- }
- }
-}
diff --git a/demos/qmlcustomizations/qml/qmlcustomizations/main.qml b/demos/qmlcustomizations/qml/qmlcustomizations/main.qml
deleted file mode 100644
index f338d692..00000000
--- a/demos/qmlcustomizations/qml/qmlcustomizations/main.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- width: parent.width
- height: parent.height
- property int __activeIndex: 1
- property real __intervalCoefficient: 0
-
- //![1]
- ChartView {
- id: chartView
- anchors.fill: parent
- title: "Wheel of fortune"
- legend.visible: false
-
- PieSeries {
- id: wheelOfFortune
- horizontalPosition: 0.3
- }
-
- SplineSeries {
- id: splineSeries
- }
-
- ScatterSeries {
- id: scatterSeries
- }
- }
- //![1]
-
- //![2]
- Component.onCompleted: {
- __intervalCoefficient = Math.random() + 0.1;
-
- for (var i = 0; i < 20; i++)
- wheelOfFortune.append("", 1);
-
- var interval = 1;
- for (var j = 0; interval < 800; j++) {
- interval = __intervalCoefficient * j * j;
- splineSeries.append(j, interval);
- }
- chartView.axisX(scatterSeries).max = j;
- chartView.axisY(scatterSeries).max = 1000;
- }
- //![2]
-
- Timer {
- triggeredOnStart: true
- running: true
- repeat: true
- interval: 100
- onTriggered: {
- var index = __activeIndex % wheelOfFortune.count;
- if (interval < 700) {
- //![3]
- wheelOfFortune.at(index).exploded = false;
- __activeIndex++;
- index = __activeIndex % wheelOfFortune.count;
- wheelOfFortune.at(index).exploded = true;
- //![3]
- interval = splineSeries.at(__activeIndex).y;
- //![4]
- scatterSeries.clear();
- scatterSeries.append(__activeIndex, interval);
- scatterSeries.color = Qt.tint(scatterSeries.color, "#05FF0000");
- scatterSeries.markerSize += 0.5;
- //![4]
- } else {
- //![5]
- // Switch the colors of the slice and the border
- wheelOfFortune.at(index).borderWidth = 2;
- var borderColor = wheelOfFortune.at(index).borderColor;
- wheelOfFortune.at(index).borderColor = wheelOfFortune.at(index).color;
- wheelOfFortune.at(index).color = borderColor;
- //![5]
- }
- }
- }
-}
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb227056..00000000
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
- QmlJsDebuggingEnabler()
- {
- QDeclarativeDebugHelper::enableDebugging();
- }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
- QString mainQmlFile;
- friend class QmlApplicationViewer;
- static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("%1/../Resources/%2")
- .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
- QString pathInInstallDir =
- QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
- pathInInstallDir =
- QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
-#endif
- return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
- : QDeclarativeView(parent)
- , d(new QmlApplicationViewerPrivate())
-{
- connect(engine(), SIGNAL(quit()), SLOT(close()));
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
- // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
- new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
- new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
- delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
- return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
- d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
- setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
- setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
- engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
- Qt::WidgetAttribute attribute;
- switch (orientation) {
-#if QT_VERSION < 0x040702
- // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
- case ScreenOrientationLockPortrait:
- attribute = static_cast<Qt::WidgetAttribute>(128);
- break;
- case ScreenOrientationLockLandscape:
- attribute = static_cast<Qt::WidgetAttribute>(129);
- break;
- default:
- case ScreenOrientationAuto:
- attribute = static_cast<Qt::WidgetAttribute>(130);
- break;
-#else // QT_VERSION < 0x040702
- case ScreenOrientationLockPortrait:
- attribute = Qt::WA_LockPortraitOrientation;
- break;
- case ScreenOrientationLockLandscape:
- attribute = Qt::WA_LockLandscapeOrientation;
- break;
- default:
- case ScreenOrientationAuto:
- attribute = Qt::WA_AutoOrientation;
- break;
-#endif // QT_VERSION < 0x040702
- };
- setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
- Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
- showMaximized();
-#else
- show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
- return MDeclarativeCache::qApplication(argc, argv);
-#else
- return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232f..00000000
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
- Q_OBJECT
-
-public:
- enum ScreenOrientation {
- ScreenOrientationLockPortrait,
- ScreenOrientationLockLandscape,
- ScreenOrientationAuto
- };
-
- explicit QmlApplicationViewer(QWidget *parent = 0);
- virtual ~QmlApplicationViewer();
-
- static QmlApplicationViewer *create();
-
- void setMainQmlFile(const QString &file);
- void addImportPath(const QString &path);
-
- // Note that this will only have an effect on Fremantle.
- void setOrientation(ScreenOrientation orientation);
-
- void showExpanded();
-
-private:
- class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc6..00000000
--- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlcustomizations/qmlcustomizations.pro b/demos/qmlcustomizations/qmlcustomizations.pro
deleted file mode 100644
index f4da8598..00000000
--- a/demos/qmlcustomizations/qmlcustomizations.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp
-OTHER_FILES += qml/qmlcustomizations/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmlcustomizations/resources.qrc b/demos/qmlcustomizations/resources.qrc
deleted file mode 100644
index d7966f36..00000000
--- a/demos/qmlcustomizations/resources.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>qml/qmlcustomizations/loader.qml</file>
- <file>qml/qmlcustomizations/main.qml</file>
- </qresource>
-</RCC>
diff --git a/demos/qmlcustomlegend/main.cpp b/demos/qmlcustomlegend/main.cpp
deleted file mode 100644
index 774b3ffc..00000000
--- a/demos/qmlcustomlegend/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QDir>
-#include "qmlapplicationviewer.h"
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
- QScopedPointer<QApplication> app(createApplication(argc, argv));
- QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-#ifdef Q_OS_ANDROID
- viewer->addImportPath(QString::fromLatin1("assets:/imports"));
- viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
- viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
-
- //viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer->setSource(QUrl("qrc:/qml/qmlcustomlegend/loader.qml"));
- viewer->setRenderHint(QPainter::Antialiasing, true);
- viewer->showExpanded();
-
- return app->exec();
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/AnimatedAreaSeries.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/AnimatedAreaSeries.qml
deleted file mode 100755
index 8173b5d6..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/AnimatedAreaSeries.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-AreaSeries {
- id: series
-
- Behavior on opacity {
- NumberAnimation { duration: 250 }
- }
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml
deleted file mode 100755
index c0b66672..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.2
-
-//![1]
-ChartView {
- id: chartViewHighlighted
- title: ""
- property variant selectedSeries
- signal clicked
- legend.visible: false
- margins.top: 10
- margins.bottom: 0
-
- LineSeries {
- id: lineSeries
-
- axisX: ValueAxis {
- min: 2006
- max: 2012
- labelFormat: "%.0f"
- tickCount: 7
- }
- axisY: ValueAxis {
- id: axisY
- titleText: "EUR"
- min: 0
- max: 40000
- niceNumbersEnabled: true
- labelFormat: "%.0f"
- tickCount: 5
- }
- }
-//![1]
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- chartViewHighlighted.clicked();
- }
- }
-
- onSelectedSeriesChanged: {
- lineSeries.clear();
- lineSeries.color = selectedSeries.color;
- var maxVal = 0.0;
- for (var i = 0; i < selectedSeries.upperSeries.count; i++ ) {
- var y = selectedSeries.upperSeries.at(i).y - selectedSeries.lowerSeries.at(i).y;
- lineSeries.append(selectedSeries.upperSeries.at(i).x, y);
- if (maxVal < y)
- maxVal = y;
- }
- chartViewHighlighted.title = selectedSeries.name;
- axisY.max = maxVal;
- }
-}
-
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewSelector.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewSelector.qml
deleted file mode 100755
index 60680934..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewSelector.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- id: chartViewSelector
- width: parent.width
- height: parent.height
- signal seriesAdded(string seriesName, color seriesColor)
-
- function highlightSeries(seriesName) {
- if (seriesName == "") {
- if (state != "")
- state = "";
-
- for (var i = 0; i < chartViewStacked.count; i++)
- chartViewStacked.series(i).opacity = 1.0;
- } else {
- var targetOpacity = 0.1;
- for (var j = 0; j < chartViewStacked.count; j++) {
- if (chartViewStacked.series(j).name != seriesName)
- chartViewStacked.series(j).opacity = 0.25;
- else if (state == "highlight")
- chartViewSelected.selectedSeries = chartViewStacked.series(j);
- }
- }
- }
-
- function selectSeries(seriesName) {
- for (var i = 0; i < chartViewStacked.count; i++) {
- if (chartViewStacked.series(i).name == seriesName) {
- chartViewSelected.selectedSeries = chartViewStacked.series(i);
- if (chartViewSelector.state == "")
- chartViewSelector.state = "highlighted";
- else
- chartViewSelector.state = "";
- }
- }
- }
-
- ChartViewStacked {
- id: chartViewStacked
- anchors.left: parent.left
- anchors.leftMargin: 0
- width: parent.width
- height: parent.height
- onSeriesAdded: chartViewSelector.seriesAdded(series.name, series.color);
- }
-
- ChartViewHighlighted {
- id: chartViewSelected
- anchors.left: chartViewStacked.right
- width: parent.width
- height: parent.height
-
- opacity: 0.0
- onClicked: {
- chartViewSelector.state = "";
- }
- }
-
- states: State {
- name: "highlighted"
- PropertyChanges {
- target: chartViewSelected
- opacity: 1.0
- }
- PropertyChanges {
- target: chartViewStacked
- anchors.leftMargin: -chartViewStacked.width
- opacity: 0.0
- }
- }
-
- transitions: Transition {
- PropertyAnimation {
- properties: "width, height, opacity, anchors.leftMargin"
- duration: 400
- }
- }
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml
deleted file mode 100755
index 365da46a..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.2
-
-ChartView {
- id: chartView
- title: "Government Taxes"
- legend.visible: false
- signal entered(string seriesName)
- signal exited(string seriesName)
- margins.top: 10
- margins.bottom: 0
-
- ValueAxis {
- id: axisX
- min: 2006
- max: 2012
- tickCount: 7
- labelFormat: "%.0f"
- }
-
- ValueAxis {
- id: axisY
- titleText: "EUR"
- min: 0
- max: 90000
- tickCount: 10
- labelFormat: "%.0f"
- }
-
- AnimatedAreaSeries {
- id: stateSeries
- name: "state"
- axisX: axisX
- axisY: axisY
- borderWidth: 0
- upperSeries: LineSeries {
- id: stateUpper
- XYPoint { x: 2006; y: 33119 }
- XYPoint { x: 2007; y: 37941 }
- XYPoint { x: 2008; y: 40122 }
- XYPoint { x: 2009; y: 38991 }
- XYPoint { x: 2010; y: 34055 }
- XYPoint { x: 2011; y: 34555 }
- XYPoint { x: 2012; y: 38991 }
- }
- lowerSeries: LineSeries {
- XYPoint { x: 2006; y: 0 }
- XYPoint { x: 2007; y: 0 }
- XYPoint { x: 2008; y: 0 }
- XYPoint { x: 2009; y: 0 }
- XYPoint { x: 2010; y: 0 }
- XYPoint { x: 2011; y: 0 }
- XYPoint { x: 2012; y: 0 }
- }
- }
-
- //![1]
- AnimatedAreaSeries {
- id: municipalSeries
- name: "municipal"
- axisX: axisX
- axisY: axisY
- borderWidth: 0
- upperSeries: LineSeries {
- id: municipalUpper
- XYPoint { x: 2006; y: 33119 + 13443 }
- XYPoint { x: 2007; y: 37941 + 15311 }
- XYPoint { x: 2008; y: 40122 + 16552 }
- XYPoint { x: 2009; y: 38991 + 17904 }
- XYPoint { x: 2010; y: 34055 + 17599 }
- XYPoint { x: 2011; y: 34555 + 19002 }
- XYPoint { x: 2012; y: 38991 + 19177 }
- }
- lowerSeries: stateUpper
- }
- //![1]
-
- AnimatedAreaSeries {
- id: socialSeries
- name: "social sec."
- axisX: axisX
- axisY: axisY
- borderWidth: 0
- upperSeries: LineSeries {
- id: socialUpper
- XYPoint { x: 2006; y: 33119 + 13443 + 18855 }
- XYPoint { x: 2007; y: 37941 + 15311 + 20238 }
- XYPoint { x: 2008; y: 40122 + 16552 + 21347 }
- XYPoint { x: 2009; y: 38991 + 17904 + 22376 }
- XYPoint { x: 2010; y: 34055 + 17599 + 22076 }
- XYPoint { x: 2011; y: 34555 + 19002 + 22631 }
- XYPoint { x: 2012; y: 38991 + 19177 + 23686 }
- }
- lowerSeries: municipalUpper
- }
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml
deleted file mode 100755
index 578eed26..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- id: legend
- color: "lightgray"
- property int seriesCount: 0
- property variant seriesNames: []
- property variant seriesColors: []
- signal entered(string seriesName)
- signal exited(string seriesName)
- signal selected(string seriesName)
-
- function addSeries(seriesName, color) {
- var names = seriesNames;
- names[seriesCount] = seriesName;
- seriesNames = names;
-
- var colors = seriesColors;
- colors[seriesCount] = color;
- seriesColors = colors;
-
- seriesCount++;
- }
-
- Gradient {
- id: buttonGradient
- GradientStop { position: 0.0; color: "#F0F0F0" }
- GradientStop { position: 1.0; color: "#A0A0A0" }
- }
-
- Gradient {
- id: buttonGradientHovered
- GradientStop { position: 0.0; color: "#FFFFFF" }
- GradientStop { position: 1.0; color: "#B0B0B0" }
- }
-
- //![2]
- Component {
- id: legendDelegate
- Rectangle {
- id: rect
- // ...
- //![2]
- property string name: seriesNames[index]
- property color markerColor: seriesColors[index]
- gradient: buttonGradient
- border.color: "#A0A0A0"
- border.width: 1
- radius: 4
- height: 20
- width: 100
-
- Row {
- id: row
- spacing: 5
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: 5
- Rectangle {
- id: marker
- anchors.verticalCenter: parent.verticalCenter
- color: markerColor
- opacity: 0.3
- radius: 4
- width: 12
- height: 10
- }
- Text {
- id: label
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: -1
- text: name
- }
- }
-
- //![3]
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- hoverEnabled: true
- onEntered: {
- rect.gradient = buttonGradientHovered;
- legend.entered(label.text);
- }
- onExited: {
- rect.gradient = buttonGradient;
- legend.exited(label.text);
- marker.opacity = 0.3;
- marker.height = 10;
- }
- onClicked: {
- legend.selected(label.text);
- marker.opacity = 1.0;
- marker.height = 12;
- }
- }
- //![3]
- }
- }
-
- //![1]
- Row {
- id: legendRow
- anchors.centerIn: parent
- spacing: 6
-
- Repeater {
- id: legendRepeater
- model: seriesCount
- delegate: legendDelegate
- }
- }
- //![1]
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/loader.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/loader.qml
deleted file mode 100755
index 1b09580d..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
- id: container
- width: 400
- height: 320
- Component.onCompleted: {
- var co = Qt.createComponent("main.qml")
- if (co.status == Component.Ready) {
- var o = co.createObject(container)
- } else {
- console.log(co.errorString())
- console.log("QtCommercial.Chart 1.1 not available")
- console.log("Please use correct QML_IMPORT_PATH export")
- }
- }
-}
diff --git a/demos/qmlcustomlegend/qml/qmlcustomlegend/main.qml b/demos/qmlcustomlegend/qml/qmlcustomlegend/main.qml
deleted file mode 100755
index 1e91b10b..00000000
--- a/demos/qmlcustomlegend/qml/qmlcustomlegend/main.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-
-Rectangle {
- id: main
- width: parent.width
- height: parent.height
-
- Column {
- id: column
- anchors.fill: parent
- anchors.bottomMargin: 10
- spacing: 0
-
- ChartViewSelector {
- id: chartViewSelector
- width: parent.width
- height: parent.height - customLegend.height - anchors.bottomMargin
- onSeriesAdded: customLegend.addSeries(seriesName, seriesColor);
- }
-
- CustomLegend {
- id: customLegend
- width: parent.width
- height: 35
- anchors.horizontalCenter: parent.horizontalCenter
- onEntered: chartViewSelector.highlightSeries(seriesName);
- onExited: chartViewSelector.highlightSeries("");
- onSelected: chartViewSelector.selectSeries(seriesName);
- }
- }
-
- states: State {
- name: "highlighted"
- PropertyChanges {
- target: chartViewHighlighted
- width: column.width
- height: (column.height - column.anchors.margins * 2 - customLegend.height)
- }
- PropertyChanges {
- target: chartViewStacked
- width: 1
- height: 1
- }
- }
-}
diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb227056..00000000
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
- QmlJsDebuggingEnabler()
- {
- QDeclarativeDebugHelper::enableDebugging();
- }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
- QString mainQmlFile;
- friend class QmlApplicationViewer;
- static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("%1/../Resources/%2")
- .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
- QString pathInInstallDir =
- QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
- pathInInstallDir =
- QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
-#endif
- return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
- : QDeclarativeView(parent)
- , d(new QmlApplicationViewerPrivate())
-{
- connect(engine(), SIGNAL(quit()), SLOT(close()));
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
- // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
- new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
- new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
- delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
- return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
- d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
- setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
- setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
- engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
- Qt::WidgetAttribute attribute;
- switch (orientation) {
-#if QT_VERSION < 0x040702
- // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
- case ScreenOrientationLockPortrait:
- attribute = static_cast<Qt::WidgetAttribute>(128);
- break;
- case ScreenOrientationLockLandscape:
- attribute = static_cast<Qt::WidgetAttribute>(129);
- break;
- default:
- case ScreenOrientationAuto:
- attribute = static_cast<Qt::WidgetAttribute>(130);
- break;
-#else // QT_VERSION < 0x040702
- case ScreenOrientationLockPortrait:
- attribute = Qt::WA_LockPortraitOrientation;
- break;
- case ScreenOrientationLockLandscape:
- attribute = Qt::WA_LockLandscapeOrientation;
- break;
- default:
- case ScreenOrientationAuto:
- attribute = Qt::WA_AutoOrientation;
- break;
-#endif // QT_VERSION < 0x040702
- };
- setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
- Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
- showMaximized();
-#else
- show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
- return MDeclarativeCache::qApplication(argc, argv);
-#else
- return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232f..00000000
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
- Q_OBJECT
-
-public:
- enum ScreenOrientation {
- ScreenOrientationLockPortrait,
- ScreenOrientationLockLandscape,
- ScreenOrientationAuto
- };
-
- explicit QmlApplicationViewer(QWidget *parent = 0);
- virtual ~QmlApplicationViewer();
-
- static QmlApplicationViewer *create();
-
- void setMainQmlFile(const QString &file);
- void addImportPath(const QString &path);
-
- // Note that this will only have an effect on Fremantle.
- void setOrientation(ScreenOrientation orientation);
-
- void showExpanded();
-
-private:
- class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc6..00000000
--- a/demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlcustomlegend/qmlcustomlegend.pro b/demos/qmlcustomlegend/qmlcustomlegend.pro
deleted file mode 100755
index fc376490..00000000
--- a/demos/qmlcustomlegend/qmlcustomlegend.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp
-OTHER_FILES += qml/qmlcustomlegend/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmlcustomlegend/resources.qrc b/demos/qmlcustomlegend/resources.qrc
deleted file mode 100755
index 5c3ad444..00000000
--- a/demos/qmlcustomlegend/resources.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>qml/qmlcustomlegend/loader.qml</file>
- <file>qml/qmlcustomlegend/main.qml</file>
- <file>qml/qmlcustomlegend/CustomLegend.qml</file>
- <file>qml/qmlcustomlegend/ChartViewStacked.qml</file>
- <file>qml/qmlcustomlegend/ChartViewHighlighted.qml</file>
- <file>qml/qmlcustomlegend/ChartViewSelector.qml</file>
- <file>qml/qmlcustomlegend/AnimatedAreaSeries.qml</file>
- </qresource>
-</RCC>
diff --git a/demos/qmlf1legends/main.cpp b/demos/qmlf1legends/main.cpp
deleted file mode 100644
index 7138ce8e..00000000
--- a/demos/qmlf1legends/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QDebug>
-#include <QDir>
-#include "qmlapplicationviewer.h"
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
- QScopedPointer<QApplication> app(createApplication(argc, argv));
-
- QmlApplicationViewer viewer;
-#ifdef Q_OS_ANDROID
- viewer.addImportPath(QString::fromLatin1("assets:/imports"));
- viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
- viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
-// viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer.setSource(QUrl("qrc:/qml/qmlf1legends/main.qml"));
- viewer.setRenderHint(QPainter::Antialiasing, true);
- viewer.showExpanded();
- return app->exec();
-}
diff --git a/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml b/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
deleted file mode 100644
index 6fb05dad..00000000
--- a/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.1
-
-//![1]
-XmlListModel {
- // Hard-coded test data
- xml: "<results><row><speedTrap>0</speedTrap><driver>Fittipaldi</driver><speed>104.12</speed></row>"
- +"<row><speedTrap>0</speedTrap><driver>Stewart</driver><speed>106.12</speed></row>"
- +"<row><speedTrap>0</speedTrap><driver>Hunt</driver><speed>106.12</speed></row>"
- // ...
-//![1]
- +"<row><speedTrap>1</speedTrap><driver>Fittipaldi</driver><speed>115.12</speed></row>"
- +"<row><speedTrap>1</speedTrap><driver>Stewart</driver><speed>114.12</speed></row>"
- +"<row><speedTrap>1</speedTrap><driver>Hunt</driver><speed>115.12</speed></row>"
- +"<row><speedTrap>2</speedTrap><driver>Hunt</driver><speed>165.23</speed></row>"
- +"<row><speedTrap>2</speedTrap><driver>Fittipaldi</driver><speed>175.23</speed></row>"
- +"<row><speedTrap>2</speedTrap><driver>Stewart</driver><speed>168.23</speed></row>"
- +"<row><speedTrap>3</speedTrap><driver>Hunt</driver><speed>104.87</speed></row>"
- +"<row><speedTrap>3</speedTrap><driver>Fittipaldi</driver><speed>104.43</speed></row>"
- +"<row><speedTrap>3</speedTrap><driver>Stewart</driver><speed>94.83</speed></row>"
- +"<row><speedTrap>4</speedTrap><driver>Hunt</driver><speed>107.87</speed></row>"
- +"<row><speedTrap>4</speedTrap><driver>Fittipaldi</driver><speed>111.84</speed></row>"
- +"<row><speedTrap>4</speedTrap><driver>Stewart</driver><speed>106.84</speed></row>"
- +"<row><speedTrap>5</speedTrap><driver>Hunt</driver><speed>94.87</speed></row>"
- +"<row><speedTrap>5</speedTrap><driver>Stewart</driver><speed>92.37</speed></row>"
- +"<row><speedTrap>5</speedTrap><driver>Fittipaldi</driver><speed>99.37</speed></row>"
- +"<row><speedTrap>6</speedTrap><driver>Hunt</driver><speed>52.87</speed></row>"
- +"<row><speedTrap>6</speedTrap><driver>Fittipaldi</driver><speed>42.87</speed></row>"
- +"<row><speedTrap>6</speedTrap><driver>Stewart</driver><speed>55.87</speed></row>"
- +"<row><speedTrap>7</speedTrap><driver>Hunt</driver><speed>77.87</speed></row>"
- +"<row><speedTrap>7</speedTrap><driver>Fittipaldi</driver><speed>72.87</speed></row>"
- +"<row><speedTrap>7</speedTrap><driver>Stewart</driver><speed>87.87</speed></row>"
- +"<row><speedTrap>8</speedTrap><driver>Hunt</driver><speed>94.17</speed></row>"
- +"<row><speedTrap>8</speedTrap><driver>Fittipaldi</driver><speed>98.17</speed></row>"
- +"<row><speedTrap>8</speedTrap><driver>Stewart</driver><speed>84.17</speed></row>"
- +"<row><speedTrap>9</speedTrap><driver>Hunt</driver><speed>91.87</speed></row>"
- +"<row><speedTrap>9</speedTrap><driver>Fittipaldi</driver><speed>71.87</speed></row>"
- +"<row><speedTrap>9</speedTrap><driver>Stewart</driver><speed>81.87</speed></row>"
- +"<row><speedTrap>10</speedTrap><driver>Hunt</driver><speed>104.87</speed></row>"
- +"<row><speedTrap>10</speedTrap><driver>Fittipaldi</driver><speed>115.87</speed></row>"
- +"<row><speedTrap>10</speedTrap><driver>Stewart</driver><speed>119.87</speed></row>"
- +"<row><speedTrap>11</speedTrap><driver>Hunt</driver><speed>162.87</speed></row>"
- +"<row><speedTrap>11</speedTrap><driver>Fittipaldi</driver><speed>155.84</speed></row>"
- +"<row><speedTrap>11</speedTrap><driver>Stewart</driver><speed>152.84</speed></row>"
- +"<row><speedTrap>12</speedTrap><driver>Hunt</driver><speed>181.87</speed></row>"
- +"<row><speedTrap>12</speedTrap><driver>Fittipaldi</driver><speed>161.85</speed></row>"
- +"<row><speedTrap>12</speedTrap><driver>Stewart</driver><speed>167.85</speed></row>"
- +"<row><speedTrap>13</speedTrap><driver>Hunt</driver><speed>155.87</speed></row>"
- +"<row><speedTrap>13</speedTrap><driver>Fittipaldi</driver><speed>154.87</speed></row>"
- +"<row><speedTrap>13</speedTrap><driver>Stewart</driver><speed>164.87</speed></row>"
- +"<row><speedTrap>14</speedTrap><driver>Hunt</driver><speed>197.57</speed></row>"
- +"<row><speedTrap>14</speedTrap><driver>Fittipaldi</driver><speed>187.54</speed></row>"
- +"<row><speedTrap>14</speedTrap><driver>Stewart</driver><speed>180.54</speed></row>"
- +"<row><speedTrap>15</speedTrap><driver>Fittipaldi</driver><speed>216.87</speed></row>"
- +"<row><speedTrap>15</speedTrap><driver>Hunt</driver><speed>207.87</speed></row>"
- +"<row><speedTrap>15</speedTrap><driver>Stewart</driver><speed>197.87</speed></row>"
- +"<row><speedTrap>16</speedTrap><driver>Hunt</driver><speed>82.87</speed></row>"
- +"<row><speedTrap>16</speedTrap><driver>Fittipaldi</driver><speed>79.37</speed></row>"
- +"<row><speedTrap>16</speedTrap><driver>Stewart</driver><speed>85.37</speed></row>"
- +"<row><speedTrap>17</speedTrap><driver>Hunt</driver><speed>153.87</speed></row>"
- +"<row><speedTrap>17</speedTrap><driver>Fittipaldi</driver><speed>143.87</speed></row>"
- +"<row><speedTrap>17</speedTrap><driver>Stewart</driver><speed>133.87</speed></row>"
- +"<row><speedTrap>18</speedTrap><driver>Hunt</driver><speed>89.87</speed></row>"
- +"<row><speedTrap>18</speedTrap><driver>Fittipaldi</driver><speed>95.85</speed></row>"
- +"<row><speedTrap>18</speedTrap><driver>Stewart</driver><speed>98.85</speed></row>"
- +"<row><speedTrap>19</speedTrap><driver>Hunt</driver><speed>169.87</speed></row>"
- +"<row><speedTrap>19</speedTrap><driver>Stewart</driver><speed>167.87</speed></row>"
- +"<row><speedTrap>19</speedTrap><driver>Fittipaldi</driver><speed>154.87</speed></row>"
- +"</results>"
-//![2]
- query: "/results/row"
-
- XmlRole { name: "speedTrap"; query: "speedTrap/string()" }
- XmlRole { name: "driver"; query: "driver/string()" }
- XmlRole { name: "speed"; query: "speed/string()" }
-}
-//![2]
diff --git a/demos/qmlf1legends/qml/qmlf1legends/main.qml b/demos/qmlf1legends/qml/qmlf1legends/main.qml
deleted file mode 100644
index 0f6ac73c..00000000
--- a/demos/qmlf1legends/qml/qmlf1legends/main.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.1
-import QtCommercial.Chart 1.1
-
-Rectangle {
- width: 400
- height: 300
- property int currentIndex: -1
-
- //![1]
- ChartView {
- id: chartView
- title: "Driver Speeds, lap 1"
- anchors.fill: parent
- legend.alignment: Qt.AlignTop
- animationOptions: ChartView.SeriesAnimations
- }
- //![1]
-
- //![2]
- // An example XmlListModel containing F1 legend drivers' speeds at speed traps
- SpeedsXml {
- id: speedsXml
- onStatusChanged: {
- if (status == XmlListModel.Ready) {
- timer.start();
- }
- }
- }
- //![2]
-
- //![3]
- // A timer to mimic refreshing the data dynamically
- Timer {
- id: timer
- interval: 700
- repeat: true
- triggeredOnStart: true
- running: false
- onTriggered: {
- currentIndex++;
- if (currentIndex < speedsXml.count) {
- // Check if there is a series for the data already (we are using driver name to identify series)
- var lineSeries = chartView.series(speedsXml.get(currentIndex).driver);
- if (!lineSeries) {
- lineSeries = chartView.createSeries(ChartView.SeriesTypeLine, speedsXml.get(currentIndex).driver);
- chartView.axisY().min = 0;
- chartView.axisY().max = 250;
- chartView.axisY().tickCount = 6;
- chartView.axisY().titleText = "speed (kph)";
- chartView.axisX().titleText = "speed trap";
- chartView.axisX().labelFormat = "%.0f";
- }
- lineSeries.append(speedsXml.get(currentIndex).speedTrap, speedsXml.get(currentIndex).speed);
-
- if (speedsXml.get(currentIndex).speedTrap > 3) {
- chartView.axisX().max = Number(speedsXml.get(currentIndex).speedTrap) + 1;
- chartView.axisX().min = chartView.axisX().max - 5;
- } else {
- chartView.axisX().max = 5;
- chartView.axisX().min = 0;
- }
- chartView.axisX().tickCount = chartView.axisX().max - chartView.axisX().min + 1;
- } else {
- // No more data, change x-axis range to show all the data
- timer.stop();
- chartView.animationOptions = ChartView.AllAnimations;
- chartView.axisX().min = 0;
- chartView.axisX().max = speedsXml.get(currentIndex - 1).speedTrap;
- }
- }
- }
- //![3]
-}
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb227056..00000000
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
- QmlJsDebuggingEnabler()
- {
- QDeclarativeDebugHelper::enableDebugging();
- }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
- QString mainQmlFile;
- friend class QmlApplicationViewer;
- static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("%1/../Resources/%2")
- .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
- if (!QDir::isAbsolutePath(path))
- return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
- QString pathInInstallDir =
- QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
- pathInInstallDir =
- QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
- if (QFileInfo(pathInInstallDir).exists())
- return pathInInstallDir;
-#endif
- return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
- : QDeclarativeView(parent)
- , d(new QmlApplicationViewerPrivate())
-{
- connect(engine(), SIGNAL(quit()), SLOT(close()));
- setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
- // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
- new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
- new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
- delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
- return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
- d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
- setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
- setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
- engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
- Qt::WidgetAttribute attribute;
- switch (orientation) {
-#if QT_VERSION < 0x040702
- // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
- case ScreenOrientationLockPortrait:
- attribute = static_cast<Qt::WidgetAttribute>(128);
- break;
- case ScreenOrientationLockLandscape:
- attribute = static_cast<Qt::WidgetAttribute>(129);
- break;
- default:
- case ScreenOrientationAuto:
- attribute = static_cast<Qt::WidgetAttribute>(130);
- break;
-#else // QT_VERSION < 0x040702
- case ScreenOrientationLockPortrait:
- attribute = Qt::WA_LockPortraitOrientation;
- break;
- case ScreenOrientationLockLandscape:
- attribute = Qt::WA_LockLandscapeOrientation;
- break;
- default:
- case ScreenOrientationAuto:
- attribute = Qt::WA_AutoOrientation;
- break;
-#endif // QT_VERSION < 0x040702
- };
- setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
- Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
- showMaximized();
-#else
- show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
- return MDeclarativeCache::qApplication(argc, argv);
-#else
- return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232f..00000000
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
- This file was generated by the Qt Quick Application wizard of Qt Creator.
- QmlApplicationViewer is a convenience class containing mobile device specific
- code such as screen orientation handling. Also QML paths and debugging are
- handled here.
- It is recommended not to modify this file, since newer versions of Qt Creator
- may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
- Q_OBJECT
-
-public:
- enum ScreenOrientation {
- ScreenOrientationLockPortrait,
- ScreenOrientationLockLandscape,
- ScreenOrientationAuto
- };
-
- explicit QmlApplicationViewer(QWidget *parent = 0);
- virtual ~QmlApplicationViewer();
-
- static QmlApplicationViewer *create();
-
- void setMainQmlFile(const QString &file);
- void addImportPath(const QString &path);
-
- // Note that this will only have an effect on Fremantle.
- void setOrientation(ScreenOrientation orientation);
-
- void showExpanded();
-
-private:
- class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc6..00000000
--- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
- include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
- DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlf1legends/qmlf1legends.pro b/demos/qmlf1legends/qmlf1legends.pro
deleted file mode 100644
index 6e18e3e4..00000000
--- a/demos/qmlf1legends/qmlf1legends.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-!include( ../demos.pri ) {
- error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp
-OTHER_FILES += qml/qmlf1legends/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmloscilloscope/datasource.cpp b/demos/qmloscilloscope/datasource.cpp
deleted file mode 100644
index 35285778..00000000
--- a/demos/qmloscilloscope/datasource.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "datasource.h"
-#include <QXYSeries>
-#include <QAreaSeries>
-#include <QDeclarativeView>
-#include <QDebug>
-#include <qmath.h>
-
-QTCOMMERCIALCHART_USE_NAMESPACE
-
-Q_DECLARE_METATYPE(QAbstractSeries *)
-Q_DECLAR