HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2639:2ce3423968b5

0

doc/docconf/qcharts-qt4.qdocconf created 644 +9 0

@@ -0,0 +1,9
	1	include(compat.qdocconf)
	2	include(macros.qdocconf)
	3	include(qchart-html-template.qdocconf)
	4	include(qchart-qch.qdocconf)
	5	include(qcharts.qdocconf)
	6
	7	outputdir = ../html
	8	imagedirs = ../images
	9	sourcedirs += ../src_qt4

0

doc/docconf/qcharts-qt5.qdocconf created 644 +9 0

@@ -0,0 +1,9
	1	include(macros.qdocconf)
	2	include(qchart-html-template.qdocconf)
	3	include(qchart-qch.qdocconf)
	4	include(qcharts.qdocconf)
	5
	6	defines = QDOC_QT5
	7	outputdir = ../html
	8	imagedirs = ../../images
	9	excludedirs += ../src_qt4

0

doc/src/abstractaxis.qdocinc created 644 +6 0

@@ -0,0 +1,6
	1	\brief The AbstractAxis is a base element used for specialized axis elements.
	2
	3	Each series can be bound to only one horizontal and vertical axis.
	4
	5	Properties and visibility of various axis elements such as axis line, title, labels, grid lines,
	6	and shades can be individually controlled.

0

doc/src/abstractbarseries.qdocinc created 644 +9 0

@@ -0,0 +1,9
	1	\inherits AbstractSeries
	2
	3	The following QML shows how to create a simple bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
	5
	6	\beginfloatleft
	7	\image demos_qmlchart6.png
	8	\endfloat
	9	\clearfloat

0

doc/src/abstractseries.qdocinc created 644 +2 0

@@ -0,0 +1,2
	1	AbstractSeries is the base class for all series.
	2	The class cannot be instantiated by the user.

0

doc/src/areaseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractSeries
	2
	3	The following QML shows how to create a simple area chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View4.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart4.png
	7	\endfloat
	8	\clearfloat

0

doc/src/barcategoryaxis.qdocinc created 644 +17 0

@@ -0,0 +1,17
	1	\inherits AbstractAxis
	2
	3	\brief The Axis element is used for manipulating chart's axes.
	4
	5	Axis can be setup to show axis line with tick marks, grid lines and shades.
	6	Categories are drawn between ticks. Note that you can use this also with lineseries too.
	7
	8	To access BarCategoryAxis you can use ChartView API. For example:
	9	\code
	10	ChartView {
	11	BarCategoryAxis {
	12	id: categoryAxis
	13	categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ]
	14	}
	15	// Add a few series...
	16	}
	17	\endcode

0

doc/src/barseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple grouped bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart6.png
	7	\endfloat
	8	\clearfloat

0

doc/src/barset.qdocinc created 644 +5 0

@@ -0,0 +1,5
	1	BarSet represents one set of bars. Set of bars contains one data value for each category.
	2	First value of set is assumed to belong to first category, second to second category and so on.
	3	If set has fewer values than there are categories, then the missing values are assumed to be
	4	at the end of set. For missing values in middle of a set, numerical value of zero is used.
	5	\sa AbstractBarSeries, BarSeries, StackedBarSeries, PercentBarSeries

0

doc/src/categoryaxis.qdocinc created 644 +12 0

@@ -0,0 +1,12
	1	\inherits AbstractAxis
	2	\brief CategoryAxis allows putting a named ranges on the axis.
	3
	4	For example:
	5	\table
	6	\row
	7	\li \br
	8	\br
	9	\br
	10	\snippet ../demos/qmlaxes/qml/qmlaxes/View3.qml 1
	11	\li \inlineimage demos_qmlaxes3.png
	12	\endtable

0

doc/src/categoryrange.qdocinc created 644 +2 0

@@ -0,0 +1,2
	1	\brief With CategoryRange you can define a range used by a CategoryAxis.
	2	\sa CategoryAxis

0

doc/src/chartview.qdocinc created 644 +11 0

@@ -0,0 +1,11
	1	ChartView element is the parent that is responsible for showing different chart series types.
	2
	3	The following QML shows how to create a simple chart with one pie series:
	4	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
	5	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
	6	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
	7
	8	\beginfloatleft
	9	\image examples_qmlpiechart.png
	10	\endfloat
	11	\clearfloat

0

doc/src/datetimeaxis.qdocinc created 644 +6 0

@@ -0,0 +1,6
	1	\brief The DateTimeAxis element is used for manipulating chart's axes.
	2	\inherits AbstractAxis
	3
	4	The labels can be configured by setting an appropriate DateTime format.
	5	Note that any date before 4714 BCE or after about 1.4 million CE may not be accurately stored.
	6	DateTimeAxis can be setup to show axis line with tick marks, grid lines and shades.

0

doc/src/declarativeboxplotseries.qdocinc created 644 +34 0

@@ -0,0 +1,34
	1	\inherits AbstractSeries
	2
	3	BoxPlotSeries represents a series of data shown as box-and-whiskers bars. The purpose of this class is to act as
	4	a container for single box-and-whiskers items. Each item is drawn to own slot. If chart includes multiple instances of
	5	BoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
	6
	7	The following QML shows how to create a simple box-and-whiskers chart:
	8	\code
	9	import QtQuick 1.0
	10	import QtCommercial.Chart 1.3
	11
	12	ChartView {
	13	title: "Box Plot series"
	14	width: 400
	15	height: 300
	16	theme: ChartView.ChartThemeBrownSand
	17	legend.alignment: Qt.AlignBottom
	18
	19	BoxPlotSeries {
	20	id: plotSeries
	21	name: "Income"
	22	BoxSet { label: "Jan"; values: [3, 4, 5.1, 6.2, 8.5] }
	23	BoxSet { label: "Feb"; values: [5, 6, 7.5, 8.6, 11.8] }
	24	BoxSet { label: "Mar"; values: [3.2, 5, 5.7, 8, 9.2] }
	25	BoxSet { label: "Apr"; values: [3.8, 5, 6.4, 7, 8] }
	26	BoxSet { label: "May"; values: [4, 5, 5.2, 6, 7] }
	27	}
	28	}
	29	\endcode
	30
	31	\beginfloatleft
	32	\image examples_qmlboxplot.png
	33	\endfloat
	34	\clearfloat

0

doc/src/declarativeboxset.qdocinc created 644 +6 0

@@ -0,0 +1,6
	1	BoxSet represents one box-and-whiskers item. It takes five values to create a graphical representation
	2	of range and three medians. There are two ways to give the values. The first one is with constructor
	3	or with append method. In these the values have to be given in the following order: lower extreme, lower quartile, median,
	4	upper quartile and upper extreme. The second method is to create an empty QBoxSet instance and give the values using
	5	value specific methods.
	6	\sa BoxPlotSeries

0

doc/src/declarativepolarchart.qdocinc created 644 +20 0

@@ -0,0 +1,20
	1	PolarChartView element is the parent that is responsible for showing different chart series types
	2	in a polar chart.
	3
	4	Polar charts support line, spline, area, and scatter series, and all axis types
	5	supported by those series.
	6
	7	\note When setting ticks to an angular ValueAxis, keep in mind that the first and last tick
	8	are co-located at 0/360 degree angle.
	9
	10	\note If the angular distance between two consecutive points in a series is more than 180 degrees,
	11	any line connecting the two points becomes meaningless, so choose the axis ranges accordingly
	12	when displaying line, spline, or area series.
	13
	14	The following QML shows how to create a polar chart with two series:
	15	\snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View1.qml 1
	16
	17	\beginfloatleft
	18	\image demos_qmlpolarchart1.png
	19	\endfloat
	20	\clearfloat

0

doc/src/declarativexypoint.qdocinc created 644 +3 0

@@ -0,0 +1,3
	1	XYPoint is a convenience element for initializing XY-series with static coordinate data. To
	2	manipulate an XY-series dynamically, use it's data manipulation functions instead.
	3	\sa LineSeries, AreaSeries, ScatterSeries, SplineSeries

0

doc/src/font.qdocinc created 644 +3 0

@@ -0,0 +1,3
	1	\brief Defines the font used for drawing text.
	2
	3	Font instantiates the C++ class QFont

0

doc/src/hbarmodelmapper.qdocinc created 644 +17 0

@@ -0,0 +1,17
	1	HBarModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source
	2	for any bar series. It is possible to use both QAbstractItemModel and bar series data API to manipulate data.
	3	HBarModelMapper keeps the series and the model in sync.
	4
	5	The following QML example would create a bar series with three bar sets (assuming the model has
	6	at least four rows). Each bar set would contain data starting from column 1. The name of a set would be defined by
	7	the vertical header (of the row).
	8	\code
	9	BarSeries {
	10	HBarModelMapper {
	11	model: myCustomModel // QAbstractItemModel derived implementation
	12	firstBarSetRow: 1
	13	lastBarSetRow: 3
	14	firstColumn: 1
	15	}
	16	}
	17	\endcode

0

doc/src/horizontalbarseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple horizontal bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View9.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart9.png
	7	\endfloat
	8	\clearfloat

0

doc/src/horizontalpercentbarseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple horizontal percent bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View11.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart11.png
	7	\endfloat
	8	\clearfloat

0

doc/src/horizontalstackedbarseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple horizontal stacked bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View10.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart10.png
	7	\endfloat
	8	\clearfloat

0

doc/src/hpiemodelmapper.qdocinc created 644 +16 0

@@ -0,0 +1,16
	1	HPieModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source
	2	for a pie series. It is possible to use both QAbstractItemModel and PieSeries data API to manipulate data.
	3	HPieModelMapper keeps the Pie and the model in sync.
	4
	5	The following QML example would create a pie series with four slices (assuming the model has
	6	at least five columns). Each slice would contain a label from row 1 and a value from row 2.
	7	\code
	8	HPieModelMapper {
	9	series: pieSeries
	10	model: customModel
	11	labelsRow: 1
	12	valuesRow: 2
	13	firstColumn: 1
	14	columnCount: 4
	15	}
	16	\endcode

0

doc/src/hxymodelmapper.qdocinc created 644 +3 0

@@ -0,0 +1,3
	1	HXYModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source
	2	for XYSeries based series. It is possible to use both QAbstractItemModel and XYSeries data API to manipulate data.
	3	HXYModelMapper keeps the series and the model in sync.

0

doc/src/legend.qdocinc created 644 +17 0

@@ -0,0 +1,17
	1	\brief Legend is part of Qt Chart QML API.
	2
	3	Legend is a graphical object, whics displays legend of the chart. Legend state is updated by ChartView, when
	4	series have been changed. Legend is used via ChartView class. For example:
	5	\code
	6	ChartView {
	7	legend.visible: true
	8	legend.alignment: Qt.AlignBottom
	9	// Add a few series...
	10	}
	11	\endcode
	12
	13	\image examples_percentbarchart_legend.png
	14
	15	Please note that there is no QML API available for modifying legend markers, unlike in the Qt API of Charts.
	16	The use case of modifying markers can be implemented for example by creating your own custom legend. For an example
	17	on how to do this, see \l {demos/qmlcustomlegend}{Qml Custom Demo} application.

0

doc/src/lineseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits XYSeries
	2
	3	The following QML shows how to create a simple line chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View2.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart2.png
	7	\endfloat
	8	\clearfloat

0

doc/src/logvalueaxis.qdocinc created 644 +7 0

@@ -0,0 +1,7
	1	\brief The LogValueAxis element is used for manipulating chart's axes.
	2	\inherits AbstractAxis
	3
	4	\note If a LogValueAxis is attached to a series with one or more points with
	5	negative or zero values on the associated dimension, the series will not be
	6	plotted at all. This is particularly relevant when XYModelMappers are used,
	7	since empty cells in models typically contain zero values.

0

doc/src/margins.qdocinc created 644 +1 0

	@@ -0,0 +1,1
				1	Uncreatable type that is used to define top, bottom, left and right margins.

0

doc/src/persentbarseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple percent bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart8.png
	7	\endfloat
	8	\clearfloat

0

doc/src/pieseries.qdocinc created 644 +10 0

@@ -0,0 +1,10
	1	\inherits AbstractSeries
	2
	3	The following QML shows how to create a simple pie chart.
	4
	5	\snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
	6
	7	\beginfloatleft
	8	\image demos_qmlchart1.png
	9	\endfloat
	10	\clearfloat

0

doc/src/pieslice.qdocinc created 644 +12 0

@@ -0,0 +1,12
	1	PieSlice defines the properties of a single slice in a PieSeries. The element should be used
	2	as a child for a PieSeries. For example:
	3	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
	4
	5	An alternative (dynamic) method for adding slices to a PieSeries is using PieSeries.append
	6	method.
	7	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 4
	8
	9	In that case you may want to use PieSeries.at or PieSeries.find to access the properties of
	10	an individual PieSlice instance.
	11	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 5
	12	\sa PieSeries

0

doc/src/scatterseries.qdocinc created 644 +9 0

@@ -0,0 +1,9
	1	\inherits XYSeries
	2
	3	The following QML shows how to create a chart with two simple scatter series:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View5.qml 1
	5
	6	\beginfloatleft
	7	\image demos_qmlchart5.png
	8	\endfloat
	9	\clearfloat

0

doc/src/splineseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits XYSeries
	2
	3	The following QML shows how to create a simple spline chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View3.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart3.png
	7	\endfloat
	8	\clearfloat

0

doc/src/stackedbarseries.qdocinc created 644 +8 0

@@ -0,0 +1,8
	1	\inherits AbstractBarSeries
	2
	3	The following QML shows how to create a simple stacked bar chart:
	4	\snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
	5	\beginfloatleft
	6	\image demos_qmlchart7.png
	7	\endfloat
	8	\clearfloat

0

doc/src/valueaxis.qdocinc created 644 +17 0

@@ -0,0 +1,17
	1	\inherits AbstractAxis
	2	\brief The ValueAxis element is used for manipulating chart's axes
	3
	4	ValueAxis can be setup to show axis line with tick marks, grid lines and shades.
	5	Values of axis are drawn to position of ticks
	6
	7	Example about using ValueAxis:
	8	\code
	9	ChartView {
	10	ValueAxis {
	11	id: xAxis
	12	min: 0
	13	max: 10
	14	}
	15	// Add a few series...
	16	}
	17	\endcode

0

doc/src/vbarmodelmapper.qdocinc created 644 +19 0

@@ -0,0 +1,19
	1	\inherits BarModelMapper
	2
	3	VBarModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
	4	for any bar series. It is possible to use both QAbstractItemModel and bar series data API to manipulate data.
	5	VBarModelMapper keeps the series and the model in sync.
	6
	7	The following QML example would create a bar series with three bar sets (assuming the
	8	model has at least four columns). Each bar set would contain data starting from row 1. The name of a set would be
	9	defined by the horizontal header (of the column).
	10	\code
	11	BarSeries {
	12	VBarModelMapper {
	13	model: myCustomModel // QAbstractItemModel derived implementation
	14	firstBarSetColumn: 1
	15	lastBarSetColumn: 3
	16	firstRow: 1
	17	}
	18	}
	19	\endcode

0

doc/src/vboxplotmodelmapper.qdocinc created 644 +18 0

@@ -0,0 +1,18
	1	VBoxPlotModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
	2	for any box-and-whiskers series. It is possible to use both QAbstractItemModel and box-and-whiskers series data API to
	3	manipulate data.
	4	VBoxPlotModelMapper keeps the series and the model in sync.
	5
	6	The following QML example would create a box-and-whiskers series with three box sets (assuming the
	7	model has at least four columns). Each box set would contain data starting from row 1. The name of a set would be
	8	defined by the horizontal header (of the column).
	9	\code
	10	BoxPlotSeries {
	11	VBoxPlotModelMapper {
	12	model: myCustomModel // QAbstractItemModel derived implementation
	13	firstBoxSetColumn: 1
	14	lastBoxSetColumn: 3
	15	firstRow: 1
	16	}
	17	}
	18	\endcode

0

doc/src/vpiemodelmapper.qdocinc created 644 +16 0

@@ -0,0 +1,16
	1	VPieModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
	2	for a pie series. It is possible to use both QAbstractItemModel and PieSeries data API to manipulate data.
	3	VPieModelMapper keeps the Pie and the model in sync.
	4
	5	The following QML example would create a pie series with four slices (assuming the model has at least five rows).
	6	Each slice would contain a label from column 1 and a value from column 2.
	7	\code
	8	VPieModelMapper {
	9	series: pieSeries
	10	model: customModel
	11	labelsColumn: 1
	12	valuesColumn: 2
	13	firstRow: 1
	14	rowCount: 4
	15	}
	16	\endcode

0

doc/src/vxymodelmapper.qdocinc created 644 +3 0

@@ -0,0 +1,3
	1	VXYModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
	2	for XYSeries based series. It is possible to use both QAbstractItemModel and XYSeries data API to manipulate data.
	3	VXYModelMapper keeps the series and the model in sync.

0

doc/src/xyseries.qdocinc created 644 +4 0

@@ -0,0 +1,4
	1	\inherits AbstractSeries
	2
	3	The XYSeries class is a base class for line, spline and scatter series.
	4	The class cannot be instantiated directly.

0

doc/src_qt5/demos.qdoc created 644 +78 0

@@ -0,0 +1,78
	1	/*!
	2	\page demos.html
	3	\title Qt Charts Demos
	4	\keyword Demos
	5
	6	\raw HTML
	7	<div class="qchart">
	8
	9	<table>
	10	<tr>
	11	<td><a href="qt-charts-demos-audio-example.html">Audio</a></td>
	12	<td><a href="qt-charts-demos-callout-example.html">Callout</a></td>
	13	</tr>
	14	<tr>
	15	<td><a href="qt-charts-demos-audio-example.html"><img src="images/demos_audio.png" width="300" alt="Audio" /></a></td>
	16	<td><a href="qt-charts-demos-callout-example.html"><img src="images/demos_callout.png" width="300" alt="Callout" /></a></td>
	17	</tr>
	18	<tr>
	19	<td><a href="qt-charts-demos-chartthemes-example.html">Chart Themes</a></td>
	20	<td><a href="qt-charts-demos-dynamicspline-example.html">Dynamic Spline Chart</a></td>
	21	</tr>
	22	<tr>
	23	<td><a href="qt-charts-demos-chartthemes-example.html"><img src="images/demo_chartthemes_blue_cerulean.png" width="300" alt="Chart Themes" /></a></td>
	24	<td><a href="qt-charts-demos-dynamicspline-example.html"><img src="images/demos_dynamicspline2.png" width="300" alt="Dynamic Spline" /></a></td>
	25	</tr>
	26	<tr>
	27	<td><a href="qt-charts-demos-nesteddonuts-example.html">Nested Donuts Chart</a></td>
	28	<td><a href="qt-charts-demos-piechartcustomization-example.html">Pie Chart Customization</a></td>
	29	</tr>
	30	<tr>
	31	<td><a href="qt-charts-demos-nesteddonuts-example.html"><img src="images/demos_nesteddonuts.png" width="300" alt="Nested Donuts Chart" /></a></td>
	32	<td><a href="qt-charts-demos-piechartcustomization-example.html"><img src="images/piechart_customization.png" width="300" alt="Pie Chart Customization" /></a></td>
	33	</tr>
	34	<tr>
	35	<td><a href="qt-charts-demos-qmlchart-example.html">Qml Basic Charts</a></td>
	36	<td><a href="qt-charts-demos-qmlaxes-example.html">Qml Axes</a></td>
	37	</tr>
	38	<tr>
	39	<td><a href="qt-charts-demos-qmlchart-example.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qml Basic Charts" /></a></td>
	40	<td><a href="qt-charts-demos-qmlaxes-example.html"><img src="images/demos_qmlaxes1.png" width="300" alt="Qml Axes" /></a></td>
	41	</tr>
	42	<tr>
	43	<td><a href="qt-charts-demos-qmlcustomizations-example.html">Qml Customizations</a></td>
	44	<td><a href="qt-charts-demos-qmlcustomlegend-example.html">Qml Custom Legend</a></td>
	45	</tr>
	46	<tr>
	47	<td><a href="qt-charts-demos-qmlcustomizations-example.html"><img src="images/demos_qmlcustomizations.png" width="300" alt="Qml Customizations" /></a></td>
	48	<td><a href="qt-charts-demos-qmlcustomlegend-example.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
	49	</tr>
	50	<tr>
	51	<td><a href="qt-charts-demos-qmlf1legends-example.html">Qml F1 Legends</a></td>
	52	<td><a href="qt-charts-demos-qmloscilloscope-example.html">Qml Oscilloscope</a></td>
	53	</tr>
	54	<tr>
	55	<td><a href="qt-charts-demos-qmlf1legends-example.html"><img src="images/demos_qmlf1legends.png" width="300" alt="Qml F1 Legends" /></a></td>
	56	<td><a href="qt-charts-demos-qmloscilloscope-example.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qml Oscilloscope" /></a></td>
	57	</tr>
	58	<tr>
	59	<td><a href="qt-charts-demos-qmlweather-example.html">Qml Weather</a></td>
	60	<td><a href="qt-charts-demos-qmlpolarchart-example.html">Qml Polar Chart</a></td>
	61	</tr>
	62	<tr>
	63	<td><a href="qt-charts-demos-qmlweather-example.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
	64	<td><a href="qt-charts-demos-qmlpolarchart-example.html"><img src="images/demos_qmlpolarchart1.png" width="300" alt="Qml Polar Chart" /></a></td>
	65	</tr>
	66	<tr>
	67	<td><a href="qt-charts-demos-quick2chart-example.html">Qt Quick 2 Basic Charts</a></td>
	68	<td><a href="qt-charts-demos-quick2oscilloscope-example.html">Qt Quick 2 Oscilloscope</a></td>
	69	</tr>
	70	<tr>
	71	<td><a href="qt-charts-demos-quick2chart-example.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
	72	<td><a href="qt-charts-demos-quick2oscilloscope-example.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qt Quick 2 Oscilloscope" /></a></td>
	73	</tr>
	74	</table>
	75	</div>
	76	\endraw
	77
	78	*/

0

doc/src_qt5/examples.qdoc created 644 +147 0

@@ -0,0 +1,147
	1	/*!
	2	\page examples.html
	3	\title Qt Charts Examples
	4	\keyword Examples
	5
	6	\raw HTML
	7	<div class="qchart">
	8
	9	<table>
	10	<tr>
	11	<td><a href="qt-charts-examples-areachart-example.html">Area Chart</a></td>
	12	<td><a href="qt-charts-examples-barchart-example.html">Bar Chart</a></td>
	13	</tr>
	14	<tr>
	15	<td><a href="qt-charts-examples-areachart-example.html"><img src="images/examples_areachart.png" width="300" alt="Area Chart" /></a></td>
	16	<td><a href="qt-charts-examples-barchart-example.html"><img src="images/examples_barchart.png" width="300" alt="Bar Chart" /></a></td>
	17	</tr>
	18
	19	<tr>
	20	<td><a href="qt-charts-examples-barmodelmapper-example.html">Bar Chart from Model</a></td>
	21	<td><a href="qt-charts-examples-boxplotchart-example.html">Box-and-whiskers Chart</a></td>
	22	</tr>
	23	<tr>
	24	<td><a href="qt-charts-examples-barmodelmapper-example.html"><img src="images/examples_barmodelmapper.png" width="300" alt="Bar Chart from Model" /></a></td>
	25	<td><a href="qt-charts-examples-boxplotchart-example.html"><img src="images/examples_boxplotchart.png" width="300" alt="Bar Chart from Model" /></a></td>
	26	</tr>
	27
	28	<tr>
	29	<td><a href="qt-charts-examples-customchart-example.html">Custom Chart</a></td>
	30	<td><a href="qt-charts-examples-datetimeaxis-example.html">DateTimeAxis Example</a></td>
	31	</tr>
	32	<tr>
	33	<td><a href="qt-charts-examples-customchart-example.html"><img src="images/examples_customchart.png" width="300" alt="Custom Chart" /></a></td>
	34	<td><a href="qt-charts-examples-datetimeaxis-example.html"><img src="images/examples_datetimeaxis.png" width="300" alt="DateTimeAxis Example" /></a></td>
	35	</tr>
	36
	37	<tr>
	38	<td><a href="qt-charts-examples-donutbreakdown-example.html">Donut Breakdown Chart</a></td>
	39	<td><a href="qt-charts-examples-donutchart-example.html">Donut Chart</a></td>
	40	</tr>
	41	<tr>
	42	<td><a href="qt-charts-examples-donutbreakdown-example.html"><img src="images/examples_donutbreakdown.png" width="300" alt="Donut Breakdown Chart" /></a></td>
	43	<td><a href="qt-charts-examples-donutchart-example.html"><img src="images/examples_donutchart.png" width="300" alt="Donut Chart" /></a></td>
	44	</tr>
	45
	46	<tr>
	47	<td><a href="qt-charts-examples-horizontalbarchart-example.html">Horizontal Bar Chart</a></td>
	48	<td><a href="qt-charts-examples-horizontalpercentbarchart-example.html">Horizontal Percent Bar Chart</a></td>
	49	</tr>
	50	<tr>
	51	<td><a href="qt-charts-examples-horizontalbarchart-example.html"><img src="images/examples_horizontalbarchart.png" width="300" alt="Horizontal Bar Chart" /></a></td>
	52	<td><a href="qt-charts-examples-horizontalpercentbarchart-example.html"><img src="images/examples_horizontalpercentbarchart.png" width="300" alt="Horizontal Percent Bar Chart" /></a></td>
	53	</tr>
	54
	55	<tr>
	56	<td><a href="qt-charts-examples-horizontalstackedbarchart-example.html">Horizontal Stacked Bar Chart</a></td>
	57	<td><a href="qt-charts-examples-legend-example.html">Legend</a></td>
	58	</tr>
	59	<tr>
	60	<td><a href="qt-charts-examples-horizontalstackedbarchart-example.html"><img src="images/examples_horizontalstackedbarchart.png" width="300" alt="Horizontal Stacked Bar Chart" /></a></td>
	61	<td><a href="qt-charts-examples-legend-example.html"><img src="images/examples_legend_detach.png" width="300" alt="Legend" /></a></td>
	62	</tr>
	63
	64	<tr>
	65	<td><a href="qt-charts-examples-legendmarkers-example.html">Legend Markers</a></td>
	66	<td><a href="qt-charts-examples-lineandbar-example.html">Line and Barchart</a></td>
	67	</tr>
	68	<tr>
	69	<td><a href="qt-charts-examples-legendmarkers-example.html"><img src="images/examples_legendmarkers.png" width="300" alt="Legend Markers" /></a></td>
	70	<td><a href="qt-charts-examples-lineandbar-example.html"><img src="images/examples_lineandbar.png" width="300" alt="Line and Barchart" /></a></td>
	71	</tr>
	72
	73	<tr>
	74	<td><a href="qt-charts-examples-linechart-example.html">Line Chart</a></td>
	75	<td><a href="qt-charts-examples-logvalueaxis-example.html">Logarithmic axis</a></td>
	76	</tr>
	77	<tr>
	78	<td><a href="qt-charts-examples-linechart-example.html"><img src="images/examples_linechart.png" width="300" alt="Line Chart" /></a></td>
	79	<td><a href="qt-charts-examples-logvalueaxis-example.html"><img src="images/examples_logvalueaxis.png" width="300" alt="Logarythmix axis" /></a></td>
	80	</tr>
	81
	82	<tr>
	83	<td><a href="qt-charts-examples-modeldata-example.html">Model Data</a></td>
	84	<td><a href="qt-charts-examples-multiaxis-example.html">Multiple axes</a></td>
	85	</tr>
	86	<tr>
	87	<td><a href="qt-charts-examples-modeldata-example.html"><img src="images/examples_modeldata.png" width="300" alt="Model Data" /></a></td>
	88	<td><a href="qt-charts-examples-multiaxis-example.html"><img src="images/examples_multiaxis.png" width="300" alt="Multiple axes" /></a></td>
	89	</tr>
	90
	91	<tr>
	92	<td><a href="qt-charts-examples-percentbarchart-example.html">Percent Bar Chart</a></td>
	93	<td><a href="qt-charts-examples-piechart-example.html">Pie Chart</a></td>
	94	</tr>
	95	<tr>
	96	<td><a href="qt-charts-examples-percentbarchart-example.html"><img src="images/examples_percentbarchart.png" width="300" alt="Percent Bar Chart" /></a></td>
	97	<td><a href="qt-charts-examples-piechart-example.html"><img src="images/examples_piechart.png" width="300" alt="Pie Chart" /></a></td>
	98	</tr>
	99
	100	<tr>
	101	<td><a href="qt-charts-examples-piechartdrilldown-example.html">Pie Chart Drilldown</a></td>
	102	<td><a href="qt-charts-examples-polarchart-example.html">Polar chart</a></td>
	103	</tr>
	104	<tr>
	105	<td><a href="qt-charts-examples-piechartdrilldown-example.html"><img src="images/examples_piechartdrill2.png" width="300" alt="Pie Chart Drilldown" /></a></td>
	106	<td><a href="qt-charts-examples-polarchart-example.html"><img src="images/examples_polarchart.png" width="300" alt="Polar chart" /></a></td>
	107	</tr>
	108
	109	<tr>
	110	<td><a href="qt-charts-examples-scatterchart-example.html">Scatter chart</a></td>
	111	<td><a href="qt-charts-examples-scatterinteractions-example.html">Scatter Interactions</a></td>
	112	</tr>
	113	<tr>
	114	<td><a href="qt-charts-examples-scatterchart-example.html"><img src="images/examples_scatterchart.png" width="300" alt="Scatter chart" /></a></td>
	115	<td><a href="qt-charts-examples-scatterinteractions-example.html"><img src="images/examples_scatterinteractions.png" width="300" alt="Scatter Interactions" /></a></td>
	116	</tr>
	117
	118	<tr>
	119	<td><a href="qt-charts-examples-splinechart-example.html">Spline Chart</a></td>
	120	<td><a href="qt-charts-examples-stackedbarchart-example.html">Stacked Bar Chart</a></td>
	121	</tr>
	122	<tr>
	123	<td><a href="qt-charts-examples-splinechart-example.html"><img src="images/examples_splinechart.png" width="300" alt="Spline Chart" /></a></td>
	124	<td><a href="qt-charts-examples-stackedbarchart-example.html"><img src="images/examples_stackedbarchart.png" width="300" alt="Stacked Bar Chart" /></a></td>
	125	</tr>
	126
	127	<tr>
	128	<td><a href="qt-charts-examples-stackedbarchartdrilldown-example.html">Stacked Bar Chart Drilldown</a></td>
	129	<td><a href="qt-charts-examples-temperaturerecords-example.html">Temperature Records</a></td>
	130	</tr>
	131	<tr>
	132	<td><a href="qt-charts-examples-stackedbarchartdrilldown-example.html"><img src="images/examples_stackedbarchartdrilldown1.png" width="300" alt="Stacked Bar Chart Drilldown" /></a></td>
	133	<td><a href="qt-charts-examples-temperaturerecords-example.html"><img src="images/examples_temperaturerecords.png" width="300" alt="Temperature Records" /></a></td>
	134	</tr>
	135
	136	<tr>
	137	<td><a href="qt-charts-examples-zoomlinechart-example.html">Zoom Line</a></td>
	138	</tr>
	139	<tr>
	140	<td><a href="qt-charts-examples-zoomlinechart-example.html"><img src="images/examples_zoomlinechart1.png" width="300" alt="Zoom Line" /></a></td>
	141	</tr>
	142
	143	</table>
	144	</div>
	145	\endraw
	146
	147	*/

0

doc/src_qt5/index.qdoc created 644 +43 0

@@ -0,0 +1,43
	1	/*!
	2	\page index.html
	3	\keyword About
	4
	5	\raw HTML
	6	<div class="qchart">
	7	<img src="images/qt-logo.png" alt="qt-logo" style="margin:0px 8px"/>
	8
	9	<p>
	10	Qt Charts is a part of the Qt Enterprise addons package. It provides a set of easy to use chart
	11	components which are available for Qt customers. It uses the Qt Graphics View
	12	Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can
	13	be used as QWidgets, QGraphicsWidget, or QML types. Users can easily create impressive
	14	graphs by selecting one of the charts themes.
	15	</p>
	16	<p>
	17	Below are a few basic examples of the different chart types. You can find more applications
	18	from the Examples and Demo sections of the documentation.
	19	</p>
	20
	21	<table>
	22	<tr>
	23	<td><a href="qt-charts-examples-linechart-example.html"><img src="images/examples_linechart.png" width="440" alt="linechart" /></a></td>
	24	<td><a href="qt-charts-examples-areachart-example.html"><img src="images/examples_areachart.png" width="440" alt="areachart" /></a></td>
	25	</tr>
	26	<tr>
	27	<td><a href="qt-charts-examples-scatterchart-example.html"><img src="images/examples_scatterchart.png" width="440" alt="scatterchart" /></a></td>
	28	<td><a href="qt-charts-examples-barchart-example.html"><img src="images/examples_barchart.png" width="440" alt="barchart" /></a></td>
	29	</tr>
	30	<tr>
	31	<td><a href="qt-charts-examples-horizontalbarchart-example.html"><img src="images/examples_horizontalbarchart.png" width="440" alt="horizontalbarchart" /></a></td>
	32	<td><a href="qt-charts-examples-piechart-example.html"><img src="images/examples_piechart.png" width="440" alt="piechart" /></a></td>
	33	</tr>
	34	<tr>
	35	<td><a href="qt-charts-examples-splinechart-example.html"><img src="images/examples_splinechart.png" width="440" alt="linechart" /></a></td>
	36	<td><a href="qt-charts-examples-customchart-example.html"><img src="images/examples_customchart.png" width="440" alt="customerchart" /></a></td>
	37	</tr>
	38	<tr>
	39	</tr>
	40	</table>
	41	</div>
	42	\endraw
	43	*/

0

doc/src_qt5/qml.qdoc created 644 +108 0

@@ -0,0 +1,108
	1	/*!
	2	\page qml.html
	3	\title Qt Charts QML API
	4	\keyword Charts QML API
	5
	6	The Qt Charts QML API is an intuitive and simple way to show charts in your QML
	7	applications.
	8
	9	\table
	10	\row
	11	\li \br
	12	Use the following QML to create a simple pie chart:
	13	\br
	14	\br
	15	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
	16	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
	17	\snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
	18	\li \inlineimage examples_qmlpiechart.png
	19	\endtable
	20
	21	\note Since Qt Charts utilizes Qt Graphics View Framework for drawing, it works best
	22	with Qt Quick 1, which is based on the same framework.
	23	As of release 1.3.0, Qt Charts is also usable with Qt Quick 2, though the performance
	24	is slightly worse than with Qt Quick 1 due to the additional rendering step that is required.
	25
	26	\note Qt Quick 1 is supported from Qt 4.7.4 onwards because of the missing
	27	Q_REVISION macro in the earlier Qt releases. Qt Quick 2 is supported with only Qt 5.
	28
	29	\raw HTML
	30	<table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
	31	<tr>
	32	<th class="titleheader" width="25%"> ChartView and it's properties </th>
	33	</tr>
	34	<tr>
	35	<td valign="top">
	36	<ul>
	37	<li><a href="qml-qtcommercial-chart-chartview.html">ChartView</a></li>
	38	<li><a href="qml-qtcommercial-chart-polarchartview.html">PolarChartView</a></li>
	39	<li><a href="qml-qtcommercial-chart-abstractaxis.html">AbstractAxis</a></li>
	40	<li><a href="qml-qtcommercial-chart-valueaxis.html">ValueAxis</a></li>
	41	<li><a href="qml-qtcommercial-chart-logvalueaxis.html">LogValueAxis</a></li>
	42	<li><a href="qml-qtcommercial-chart-categoryaxis.html">CategoryAxis</a></li>
	43	<li><a href="qml-qtcommercial-chart-categoryrange.html">CategoryRange</a></li>
	44	<li><a href="qml-qtcommercial-chart-barcategoryaxis.html">BarCategoryAxis</a></li>
	45	<li><a href="qml-qtcommercial-chart-datetimeaxis.html">DateTimeAxis</a></li>
	46	<li><a href="qml-qtcommercial-chart-legend.html">Legend</a></li>
	47	<li><a href="qml-qtcommercial-chart-abstractseries.html">AbstractSeries</a></li>
	48	</ul>
	49	</td>
	50	</tr>
	51	</table>
	52	<table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
	53	<tr>
	54	<th class="titleheader" width="25%"> XY chart </th>
	55	</tr>
	56	<tr>
	57	<td valign="top">
	58	<ul>
	59	<li><a href="qml-qtcommercial-chart-xyseries.html">XYSeries</a></li>
	60	<li><a href="qml-qtcommercial-chart-lineseries.html">LineSeries</a></li>
	61	<li><a href="qml-qtcommercial-chart-areaseries.html">AreaSeries</a></li>
	62	<li><a href="qml-qtcommercial-chart-scatterseries.html">ScatterSeries</a></li>
	63	<li><a href="qml-qtcommercial-chart-splineseries.html">SplineSeries</a></li>
	64	<li><a href="qml-qtcommercial-chart-xypoint.html">XYPoint</a></li>
	65	<li><a href="qml-qtcommercial-chart-hxymodelmapper.html">HXYModelMapper</a></li>
	66	<li><a href="qml-qtcommercial-chart-vxymodelmapper.html">VXYModelMapper</a></li>
	67	</ul>
	68	</td>
	69	</tr>
	70	</table>
	71	<table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
	72	<tr>
	73	<th class="titleheader" width="25%"> Pie chart </th>
	74	<tr>
	75	<td valign="top">
	76	<ul>
	77	<li><a href="qml-qtcommercial-chart-pieseries.html">PieSeries</a></li>
	78	<li><a href="qml-qtcommercial-chart-pieslice.html">PieSlice</a></li>
	79	<li><a href="qml-qtcommercial-chart-hpiemodelmapper.html">HPieModelMapper</a></li>
	80	<li><a href="qml-qtcommercial-chart-vpiemodelmapper.html">VPieModelMapper</a></li>
	81	</ul>
	82	</td>
	83	</tr>
	84	</table>
	85	<table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
	86	<tr>
	87	<th class="titleheader" width="25%"> Bar chart </th>
	88	<tr>
	89	<td valign="top">
	90	<ul>
	91	<li><a href="qml-qtcommercial-chart-barseries.html">BarSeries</a></li>
	92	<li><a href="qml-qtcommercial-chart-stackedbarseries.html">StackedBarSeries</a></li>
	93	<li><a href="qml-qtcommercial-chart-percentbarseries.html">PercentBarSeries</a></li>
	94	<li><a href="qml-qtcommercial-chart-horizontalbarseries.html">HorizontalBarSeries</a></li>
	95	<li><a href="qml-qtcommercial-chart-horizontalstackedbarseries.html">HorizontalStackedBarSeries</a></li>
	96	<li><a href="qml-qtcommercial-chart-horizontalpercentbarseries.html">HorizontalPercentBarSeries</a></li>
	97	<li><a href="qml-qtcommercial-chart-barset.html">BarSet</a></li>
	98	<li><a href="qml-qtcommercial-chart-boxplotseries.html">BoxPlotSeries</a></li>
	99	<li><a href="qml-qtcommercial-chart-boxset.html">BoxSet</a></li>
	100	<li><a href="qml-qtcommercial-chart-hbarmodelmapper.html">HBarModelMapper</a></li>
	101	<li><a href="qml-qtcommercial-chart-vbarmodelmapper.html">VBarModelMapper</a></li>
	102	<li><a href="qml-qtcommercial-chart-vboxplotmodelmapper.html">VBoxPlotModelMapper</a></li>
	103	</ul>
	104	</td>
	105	</tr>
	106	</table>
	107	\endraw
	108	*/

0

doc/src_qt5/qmlmodule.qdoc created 644 +3 0

@@ -0,0 +1,3
	1	/*!
	2	\qmlmodule QtCommercial.Chart 1.3
	3	*/

0

charts.pro +11 -4

             INSTALLS += feature
             # docs
-            CHARTS_VERSION = 1.3.0
+            CHARTS_VERSION = 1.3.1
-            CHARTS_VERSION_TAG = 130
+            CHARTS_VERSION_TAG = 131
+            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\\qcharts.qdocconf
+                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&&
                         set QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG $$escape_expand(\\n\\t)
                 }
             } else {
-                QDOC_CONF = $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
+                QDOC_CONF = $$CHART_BUILD_DOC_DIR/docconf/$$QDOC_CONFFILE
                 VERSION_SETTINGS = \
                     QT_CHARTS_VERSION=$$CHARTS_VERSION QT_CHARTS_VERSION_TAG=$$CHARTS_VERSION_TAG
             }

0

doc/docconf/compat.qdocconf ~~doc/compat.qdocconf~~ renamed +4 -1

             macro.0                         = "\\\\0"
-            macro.b                         = "\\\\b"
+            macro.b                         = "\\bold"
             macro.n                         = "\\\\n"
             macro.r                         = "\\\\r"
             macro.i                         = "\\o"
             spurious                        = "Missing comma in .*" \
                                               "Missing pattern .*"
+            macro.li                        = "\\o"
+            macro.e                         = "\\i"
  No newline at end of file

0

doc/docconf/macros.qdocconf ~~doc/macros.qdocconf~~ renamed 0 0

1

NO CONTENT: file renamed from doc/macros.qdocconf to doc/docconf/macros.qdocconf

0

doc/docconf/qchart-html-template.qdocconf ~~doc/qchart-html-template.qdocconf~~ renamed 0 0

1

NO CONTENT: file renamed from doc/qchart-html-template.qdocconf to doc/docconf/qchart-html-template.qdocconf

0

doc/docconf/qchart-html.qdocconf ~~doc/qchart-html.qdocconf~~ renamed +12 -13

             HTML.templatedir = .
-            HTML.stylesheets = style/offline.css
+            HTML.stylesheets = ../style/offline.css
             HTML.scripts     =
                                       bg.png
             # extraimages definition for Qt5
-            HTML.extraimages        = ./images/qt-logo.png \
+            HTML.extraimages        = ../images/qt-logo.png \
-                                      ./images/digia_logo.png \
+                                      ../images/digia_logo.png \
-                                      ./images/qcharts.png \
+                                      ../images/qcharts.png \
-                                      ./images/arrow_down.png \
+                                      ../images/arrow_down.png \
-                                      ./images/breadcrumb.png \
+                                      ../images/breadcrumb.png \
-                                      ./images/bullet_gt.png \
+                                      ../images/bullet_gt.png \
-                                      ./images/bullet_dn.png \
+                                      ../images/bullet_dn.png \
-                                      ./images/bullet_sq.png \
+                                      ../images/bullet_sq.png \
-                                      ./images/bullet_up.png \
+                                      ../images/bullet_up.png \
-                                      ./images/horBar.png \
+                                      ../images/horBar.png \
-                                      ./images/presenterchart_example.png \
+                                      ../images/bg.png
-                                      ./images/bg.png
             # Include the style sheets and scripts used.

0

doc/docconf/qchart-qch.qdocconf ~~doc/qchart-qch.qdocconf~~ renamed 0 0

1

NO CONTENT: modified file, file renamed from doc/qchart-qch.qdocconf to doc/docconf/qchart-qch.qdocconf

0

doc/docconf/qcharts.qdocconf ~~doc/qcharts.qdocconf~~ renamed +12 -21

@@ -1,33 +1,24
1	include(compat.qdocconf)
2	include(macros.qdocconf)
3	include(qchart-html-template.qdocconf)
4	include(qchart-qch.qdocconf)
5
6	project = Qt Charts	1	project = Qt Charts
7	description = Library for creating charts	2	description = Library for creating charts
		3	version = 1.3.1
8		4
9	sourcedirs = ../src \	5	sourcedirs = ../../src \
10	../examples \	6	../../examples \
11	./src \
12	../plugins/declarative
13	headerdirs = ../src \
14	../examples \
15	../plugins/declarative
16	exampledirs = ../ \
17	../src \	7	../src \
18	~~../examples~~	8	../qch \
19		9	../../plugins/declarative
20	excludefiles += ../examples/linechart/linechart.pro	10	headerdirs = ../../src \
		11	../../examples \
		12	../../plugins/declarative
		13	exampledirs = ../../ \
		14	../../src \
		15	../../examples
21		16
22	sources.fileextensions = .cpp .qdoc .mm .qml	17	sources.fileextensions = .cpp .qdoc .mm .qml *.qdocinc
23	headers.fileextensions = .h .ch .h++ .hh .hpp .hxx	18	headers.fileextensions = .h .ch .h++ .hh .hpp .hxx
24	examples.fileextensions = .cpp .h .js .xq .svg .xml .ui .qhp .qhcp .qml	19	examples.fileextensions = .cpp .h .js .xq .svg .xml .ui .qhp .qhcp .qml
25	examples.imageextensions = .png .jpeg .jpg .gif *.mng	20	examples.imageextensions = .png .jpeg .jpg .gif *.mng
26		21
27	imagedirs = ./images
28	outputdir = ./html
29
30
31	Cpp.ignoretokens = QTCOMMERCIALCHART_EXPORT \	22	Cpp.ignoretokens = QTCOMMERCIALCHART_EXPORT \
32	QTCOMMERCIALCHART_END_NAMESPACE \	23	QTCOMMERCIALCHART_END_NAMESPACE \
33	QTCOMMERCIALCHART_BEGIN_NAMESPACE	24	QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

doc/src/classes.qdoc +1 0

                                 <li><a href="qboxset.html">QBoxSet</a></li>
                                 <li><a href="qhbarmodelmapper.html">QHBarModelMapper</a></li>
                                 <li><a href="qvbarmodelmapper.html">QVBarModelMapper</a></li>
+                                <li><a href="qvboxplotmodelmapper.html">QVBoxPlotModelMapper</a></li>
                                 <li><a href="qhorizontalbarseries.html">QHorizontalBarSeries</a></li>
                                 <li><a href="qhorizontalstackedbarseries.html">QHorizontalStackedBarSeries</a></li>
                                 <li><a href="qhorizontalpercentbarseries.html">QHorizontalPercentBarSeries</a></li>

0

doc/src/demos-qmlaxes.qdoc +6 -6

                 \table
                     \row
-                        \o  \br
+                        \li \br
                             We begin with a chart that has a line series and a scatter series with random
                             data. Both series use the same axes.
                             \br
                             \br
                             \snippet ../demos/qmlaxes/qml/qmlaxes/View1.qml 1
-                        \o \inlineimage demos_qmlaxes1.png
+                        \li \inlineimage demos_qmlaxes1.png
                     \row
-                        \o  \br
+                        \li \br
                             The next example shows a chart with some accurate historical data that makes us to use a DateTimeAxis.
                             \br
                             \br
                             \snippet ../demos/qmlaxes/qml/qmlaxes/View2.qml 1
-                        \o \inlineimage demos_qmlaxes2.png
+                        \li \inlineimage demos_qmlaxes2.png
                     \row
-                        \o  \br
+                        \li  \br
                             And the final example with a chart that uses a CategoryAxis to make the data easier to understand.
                             \br
                             \br
                             \snippet ../demos/qmlaxes/qml/qmlaxes/View3.qml 1
-                        \o \inlineimage demos_qmlaxes3.png
+                        \li \inlineimage demos_qmlaxes3.png
                 \endtable
             */

0

doc/src/demos-qmlchart.qdoc +24 -24

                 \table
                     \row
-                        \o  \br
+                        \li \br
                             To create a pie, we use the PieSeries API together with a few PieSlices:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
-                        \o \inlineimage demos_qmlchart1.png
+                        \li \inlineimage demos_qmlchart1.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             To create a chart with a line series:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View2.qml 1
-                        \o \inlineimage demos_qmlchart2.png
+                        \li \inlineimage demos_qmlchart2.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             And spline series:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View3.qml 1
-                        \o \inlineimage demos_qmlchart3.png
+                        \li \inlineimage demos_qmlchart3.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             Then we create a chart that illustrates the NHL All-Star player selections by using three area series:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View4.qml 1
-                        \o \inlineimage demos_qmlchart4.png
+                        \li \inlineimage demos_qmlchart4.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             Then a couple of scatter series:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View5.qml 1
-                        \o \inlineimage demos_qmlchart5.png
+                        \li \inlineimage demos_qmlchart5.png
                 \endtable
                 And a few different bar series:
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
-                        \o \inlineimage demos_qmlchart6.png
+                        \li \inlineimage demos_qmlchart6.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
-                        \o \inlineimage demos_qmlchart7.png
+                        \li \inlineimage demos_qmlchart7.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
-                        \o \inlineimage demos_qmlchart8.png
+                        \li \inlineimage demos_qmlchart8.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View9.qml 1
-                        \o \inlineimage demos_qmlchart9.png
+                        \li \inlineimage demos_qmlchart9.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View10.qml 1
-                        \o \inlineimage demos_qmlchart10.png
+                        \li \inlineimage demos_qmlchart10.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View11.qml 1
-                        \o \inlineimage demos_qmlchart11.png
+                        \li \inlineimage demos_qmlchart11.png
                 \endtable
                 \table
                     \row
-                        \o  \br
+                        \li \br
                             And finally an example demonstrating how to create a donut chart with two pie series:
                             \br
                             \br
                             \snippet ../demos/qmlchart/qml/qmlchart/View12.qml 1
-                        \o \inlineimage demos_qmlchart12.png
+                        \li \inlineimage demos_qmlchart12.png
                 \endtable
             */

0

doc/src/demos-qmlcustomlegend.qdoc +6 -6

                 \table
                     \row
-                        \o  \br
+                        \li \br
                             The main view of the application shows a stacked area chart. This is how one of
                             \br
                             the stacked areas is created. See ChartViewStacked.qml and AnimatedAreaSeries.qml.
                             \br
                             \br
                             \snippet ../demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewStacked.qml 1
-                        \o \inlineimage demos-qmlcustomlegend1.png
+                        \li \inlineimage demos-qmlcustomlegend1.png
                     \row
-                        \o  \br
+                        \li \br
                             Hovering with mouse on top of the legend will highlight the hovered series.
                             \br
                             (see CustomLegend.qml).
                             \snippet ../demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml 1
                             \snippet ../demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml 2
                             \snippet ../demos/qmlcustomlegend/qml/qmlcustomlegend/CustomLegend.qml 3
-                        \o \inlineimage demos-qmlcustomlegend2.png
+                        \li \inlineimage demos-qmlcustomlegend2.png
                     \row
-                        \o  \br
+                        \li \br
                             You can also select one of the stacked areas for a closer look as a line series by
                             \br
                             a mouse click (see ChartViewHighlighted.qml).
                             \br
                             \br
                             \snippet ../demos/qmlcustomlegend/qml/qmlcustomlegend/ChartViewHighlighted.qml 1
-                        \o \inlineimage demos-qmlcustomlegend3.png
+                        \li \inlineimage demos-qmlcustomlegend3.png
                 \endtable
             */

0

doc/src/demos-qmlpolarchart.qdoc +6 -6

                 \table
                     \row
-                        \o  \br
+                        \li \br
                             We begin with a chart that has a spline series and a scatter series with random
                             data. Both series use the same axes.
                             \br
                             \br
                             \snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View1.qml 1
-                        \o \inlineimage demos_qmlpolarchart1.png
+                        \li \inlineimage demos_qmlpolarchart1.png
                     \row
-                        \o  \br
+                        \li \br
                             The next example shows a chart with some accurate historical data for which we need to use a DateTimeAxis
                             and a AreaSeries.
                             \br
                             \br
                             \snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View2.qml 1
-                        \o \inlineimage demos_qmlpolarchart2.png
+                        \li \inlineimage demos_qmlpolarchart2.png
                     \row
-                        \o  \br
+                        \li \br
                             And the final example with a chart that uses a CategoryAxis to make the data easier to understand.
                             \br
                             \br
                             \snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View3.qml 1
-                        \o \inlineimage demos_qmlpolarchart3.png
+                        \li \inlineimage demos_qmlpolarchart3.png
                 \endtable
             */

0

doc/src/examples-legend.qdoc +2 -2

                 \table
                     \row
-                        \o \inlineimage examples_legend_detach.png
+                        \li \inlineimage examples_legend_detach.png
-                        \o \inlineimage examples_legend_detach2.png
+                        \li \inlineimage examples_legend_detach2.png
                 \endtable
                 Here we turn the legend visible and set its alignment to the bottom of the chart.

0

doc/src/gettingstarted.qdoc +4 -4

                 make install
                 \endcode
-                Please note that the \i build_all option is necessary for the install to work correctly. Otherwise it will not install both versions.
+                Please note that the \e build_all option is necessary for the install to work correctly. Otherwise it will not install both versions.
                 Building without demos and examples:
                 \code
                 make install
                 \endcode
-                \bold {New project}
+                \b {New project}
                 Create a new project in a usual way and then add to your project's *.pro file following line:
                 CONFIG += qtcommercialchart
                 \endcode
-                \bold {Widget project}
+                \b {Widget project}
                 To use the Qt Charts classes add Qt Charts namespace macro in your header file.
                 \code
                 class ExampleWidget : public QWidget
                 \endcode
-                \bold {QML project}
+                \b {QML project}
                 Add an import line to your *.qml file:
                 \code

0

doc/src_qt4/demos.qdoc ~~doc/src/demos.qdoc~~ renamed 0 0

1

NO CONTENT: file renamed from doc/src/demos.qdoc to doc/src_qt4/demos.qdoc

0

doc/src_qt4/examples.qdoc ~~doc/src/examples.qdoc~~ renamed 0 0

1

NO CONTENT: file renamed from doc/src/examples.qdoc to doc/src_qt4/examples.qdoc

0

doc/src_qt4/index.qdoc ~~doc/src/index.qdoc~~ renamed 0 0

1

NO CONTENT: file renamed from doc/src/index.qdoc to doc/src_qt4/index.qdoc

0

doc/src_qt4/qml.qdoc ~~doc/src/qml.qdoc~~ renamed +4 -3

                 \table
                     \row
-                        \o  \br
+                        \li \br
                             Use the following QML to create a simple pie chart:
                             \br
                             \br
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
                             \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
-                        \o \inlineimage examples_qmlpiechart.png
+                        \li \inlineimage examples_qmlpiechart.png
                 \endtable
                 \note Since Qt Charts utilizes Qt Graphics View Framework for drawing, it works best
                                 <li><a href="qml-polarchartview.html">PolarChartView</a></li>
                                 <li><a href="qml-abstractaxis.html">AbstractAxis</a></li>
                                 <li><a href="qml-valueaxis.html">ValueAxis</a></li>
-                                <li><a href="qml-logvaluesaxis.html">LogValueAxis</a></li>
+                                <li><a href="qml-logvalueaxis.html">LogValueAxis</a></li>
                                 <li><a href="qml-categoryaxis.html">CategoryAxis</a></li>
                                 <li><a href="qml-categoryrange.html">CategoryRange</a></li>
                                 <li><a href="qml-barcategoryaxis.html">BarCategoryAxis</a></li>
                                 <li><a href="qml-boxset.html">BoxSet</a></li>
                                 <li><a href="qml-hbarmodelmapper.html">HBarModelMapper</a></li>
                                 <li><a href="qml-vbarmodelmapper.html">VBarModelMapper</a></li>
+                                <li><a href="qml-vboxplotmodelmapper.html">VBoxPlotModelMapper</a></li>
                                 </ul>
                             </td>
                         </tr>

0

plugins/declarative/declarativeboxplotseries.cpp +23 -39

@@ -25,16 +25,21
25		25
26	QTCOMMERCIALCHART_BEGIN_NAMESPACE	26	QTCOMMERCIALCHART_BEGIN_NAMESPACE
27		27
		28	#ifdef QDOC_QT5
		29	/*!
		30	\qmltype BoxSet
		31	\instantiates QBoxSet
		32	\inqmlmodule QtCommercial.Chart
		33
		34	\include /doc/src/declarativeboxset.qdocinc
		35	*/
		36	#else
28	/*!	37	/*!
29	\qmlclass BoxSet QBoxSet	38	\qmlclass BoxSet QBoxSet
30		39
31	BoxSet represents one box-and-whiskers item. It takes five values to create a graphical representation	40	\include ../doc/src/declarativeboxset.qdocinc
32	of range and three medians. There are two ways to give the values. The first one is with constructor
33	or with append method. In these the values have to be given in the following order: lower extreme, lower quartile, median,
34	upper quartile and upper extreme. The second method is to create an empty QBoxSet instance and give the values using
35	value specific methods.
36	\sa BoxPlotSeries
37	*/	41	*/
		42	#endif
38	/*!	43	/*!
39	\qmlproperty string BoxSet::values	44	\qmlproperty string BoxSet::values
40	The values on the box-and-whiskers set.	45	The values on the box-and-whiskers set.
@@ -95,43 +100,22 QTCOMMERCIALCHART_BEGIN_NAMESPACE
95	*/	100	*/
96		101
97		102
		103	#ifdef QDOC_QT5
98	/*!	104	/*!
99	\qml~~class BoxPlotSeries Q~~BoxPlotSeries	105	\qmltype BoxPlotSeries
100	\inherits QAbstractSeries	106	\instantiates QBoxPlotSeries
101		107	\inqmlmodule QtCommercial.Chart
102	BoxPlotSeries represents a series of data shown as box-and-whiskers bars. The purpose of this class is to act as
103	a container for single box-and-whiskers items. Each item is drawn to own slot. If chart includes multiple instances of
104	BoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
105
106	The following QML shows how to create a simple box-and-whiskers chart:
107	\code
108	import QtQuick 1.0
109	import QtCommercial.Chart 1.3
110
111	ChartView {
112	title: "Box Plot series"
113	width: 400
114	height: 300
115	theme: ChartView.ChartThemeBrownSand
116	legend.alignment: Qt.AlignBottom
117		108
118	BoxPlotSeries {	109	\include /doc/src/declarativeboxplotseries.qdocinc
119	id: plotSeries	110	*/
120	name: "Income"	111	#else
121	BoxSet { label: "Jan"; values: [3, 4, 5.1, 6.2, 8.5] }	112	/*!
122	BoxSet { label: "Feb"; values: [5, 6, 7.5, 8.6, 11.8] }	113	\qmlclass BoxPlotSeries QBoxPlotSeries
123	BoxSet { label: "Mar"; values: [3.2, 5, 5.7, 8, 9.2] }
124	BoxSet { label: "Apr"; values: [3.8, 5, 6.4, 7, 8] }
125	BoxSet { label: "May"; values: [4, 5, 5.2, 6, 7] }
126	}
127	}
128	\endcode
129		114
130	\beginfloatleft	115	\include ../doc/src/declarativeboxplotseries.qdocinc
131	\image examples_qmlboxplot.png
132	\endfloat
133	\clearfloat
134	*/	116	*/
		117	#endif
		118
135	/*!	119	/*!
136	\qmlmethod BoxPlotSeries::append(string label, VariantList values)	120	\qmlmethod BoxPlotSeries::append(string label, VariantList values)
137	Appends a new box-and-whiskers set with \a label and \a values to the series.	121	Appends a new box-and-whiskers set with \a label and \a values to the series.

0

plugins/declarative/declarativecategoryaxis.cpp +11 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype CategoryRange
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/categoryrange.qdocinc
+            */
+            #else
             /*!
                 \qmlclass CategoryRange
-                \brief With CategoryRange you can define a range used by a CategoryAxis.
-                \sa CategoryAxis
+                \include ../doc/src/categoryrange.qdocinc
             */
+            #endif
             DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
                 QObject(parent),

0

plugins/declarative/declarativechart.cpp +13 -13

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass ChartView DeclarativeChart
+                \qmltype ChartView
+                \instantiates DeclarativeChart
-                ChartView element is the parent that is responsible for showing different chart series types.
+                \inqmlmodule QtCommercial.Chart
-                The following QML shows how to create a simple chart with one pie series:
+                \include /doc/src/chartview.qdocinc
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1
+            */
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
+            #else
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3
+            /*!
+                \qmlclass ChartView DeclarativeChart
-                \beginfloatleft
+                \include ../doc/src/chartview.qdocinc
-                \image examples_qmlpiechart.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
               \qmlproperty Theme ChartView::theme
             /*!
               \qmlproperty Font ChartView::titleFont
-              The title font of the chart
+              The title font of the chart.
-              See the \l {Font} {QML Font Element} for detailed documentation.
+              See the Qt documentation for more details of Font.
             */
             /*!

0

plugins/declarative/declarativemargins.cpp +11 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype Margins
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/margins.qdocinc
+            */
+            #else
             /*!
                 \qmlclass Margins
-                Uncreatable type that is used to define top, bottom, left and right margins.
+                \include ../doc/src/margins.qdocinc
             */
+            #endif
             /*!
                 \qmlproperty int Margins::top

0

plugins/declarative/declarativepolarchart.cpp +11 -20

@@ -23,30 +23,21
23		23
24	QTCOMMERCIALCHART_BEGIN_NAMESPACE	24	QTCOMMERCIALCHART_BEGIN_NAMESPACE
25		25
		26	#ifdef QDOC_QT5
26	/*!	27	/*!
27	\qmlclass PolarChartView DeclarativePolarChart	28	\qmltype PolarChartView
28		29	\instantiates DeclarativePolarChart
29	PolarChartView element is the parent that is responsible for showing different chart series types	30	\inqmlmodule QtCommercial.Chart
30	in a polar chart.
31
32	Polar charts support line, spline, area, and scatter series, and all axis types
33	supported by those series.
34
35	\note When setting ticks to an angular ValueAxis, keep in mind that the first and last tick
36	are co-located at 0/360 degree angle.
37		31
38	\note If the angular distance between two consecutive points in a series is more than 180 degrees,	32	\include /doc/src/declarativepolarchart.qdocinc
39	any line connecting the two points becomes meaningless, so choose the axis ranges accordingly	33	*/
40	when displaying line, spline, or area series.	34	#else
41		35	/*!
42	The following QML shows how to create a polar chart with two series:	36	\qmlclass PolarChartView DeclarativePolarChart
43	\snippet ../demos/qmlpolarchart/qml/qmlpolarchart/View1.qml 1
44		37
45	\beginfloatleft	38	\include ../doc/src/declarativepolarchart.qdocinc
46	\image demos_qmlpolarchart1.png
47	\endfloat
48	\clearfloat
49	*/	39	*/
		40	#endif
50		41
51	DeclarativePolarChart::DeclarativePolarChart(QDECLARATIVE_ITEM *parent)	42	DeclarativePolarChart::DeclarativePolarChart(QDECLARATIVE_ITEM *parent)
52	: DeclarativeChart(QChart::ChartTypePolar, parent)	43	: DeclarativeChart(QChart::ChartTypePolar, parent)

0

plugins/declarative/declarativexypoint.cpp +11 -3

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype XYPoint
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/declarativexypoint.qdocinc
+            */
+            #else
             /*!
                 \qmlclass XYPoint QPointF
-                XYPoint is a convenience element for initializing XY-series with static coordinate data. To
-                manipulate an XY-series dynamically, use it's data manipulation functions instead.
+                \include ../doc/src/declarativexypoint.qdocinc
-                \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries
             */
+            #endif
             /*!
                 \qmlproperty real XYPoint::x

0

src/areachart/qareaseries.cpp +12 -6

             /*!
                 \class QAreaSeries
+                \inmodule Qt Charts
                 \brief The QAreaSeries class is used for making area charts.
                 \mainclass
                 See the \l {AreaChart Example} {area chart example} to learn how to create a simple area chart.
                 \image examples_areachart.png
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype AreaSeries
+                \instantiates QAreaSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/areaseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass AreaSeries QAreaSeries
-                The following QML shows how to create a simple area chart:
+                \include ../doc/src/areaseries.qdocinc
-                \snippet ../demos/qmlchart/qml/qmlchart/View4.qml 1
-                \beginfloatleft
-                \image demos_qmlchart4.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                \property QAreaSeries::upperSeries

0

src/axis/barcategoryaxis/qbarcategoryaxis.cpp +12 -15

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarCategoryAxis
+                \inmodule Qt Charts
                 \brief The QBarCategoryAxis class is used for manipulating chart's axis.
                 \mainclass
                 \endcode
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass BarCategoryAxis QBarCategoryAxis
+                \qmltype BarCategoryAxis
-                \inherits AbstractAxis
+                \instantiates QBarCategoryAxis
-                \brief The Axis element is used for manipulating chart's axes.
+                \inqmlmodule QtCommercial.Chart
-                Axis can be setup to show axis line with tick marks, grid lines and shades.
+                \include /doc/src/barcategoryaxis.qdocinc
-                Categories are drawn between ticks. Note that you can use this also with lineseries too.
+            */
+            #else
+            /*!
+                \qmlclass BarCategoryAxis QBarCategoryAxis
-                To access BarCategoryAxis you can use ChartView API. For example:
+                \include ../doc/src/barcategoryaxis.qdocinc
-                \code
-                    ChartView {
-                        BarCategoryAxis {
-                            id: categoryAxis
-                            categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ]
-                    // Add a few series...
-                \endcode
             */
+            #endif
             /*!
               \property QBarCategoryAxis::categories

0

src/axis/categoryaxis/qcategoryaxis.cpp +14 -13

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QCategoryAxis
+                \inmodule Qt Charts
                 \brief The QCategoryAxis class allows putting a named ranges on the axis.
                 \mainclass
                 Example code on how to use QCategoryAxis:
                 \table
                     \row
-                        \o  \br
+                        \li  \br
                             \br
                             \code
                             QChartView *chartView = new QChartView;
                             axisY->append("Third", 52);
                             chartView->chart()->setAxisY(axisY, series);
                             \endcode
-                        \o \br
+                        \li \br
                            \inlineimage api_category_axis.png
                 \endtable
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype CategoryAxis
+                \instantiates QCategoryAxis
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/categoryaxis.qdocinc
+            */
+            #else
             /*!
                 \qmlclass CategoryAxis QCategoryAxis
-                \inherits AbstractAxis
-                \brief CategoryAxis allows putting a named ranges on the axis.
-                For example:
+                \include ../doc/src/categoryaxis.qdocinc
-                \table
-                    \row
-                        \o  \br
-                            \br
-                            \br
-                            \snippet ../demos/qmlaxes/qml/qmlaxes/View3.qml 1
-                        \o \inlineimage demos_qmlaxes3.png
-                \endtable
             */
+            #endif
             /*!
               \property QCategoryAxis::startValue

0

src/axis/datetimeaxis/qdatetimeaxis.cpp +12 -5

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QDateTimeAxis
+                \inmodule Qt Charts
                 \brief The QDateTimeAxis class is used for manipulating chart's axis.
                 \mainclass
                 \endcode
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype DateTimeAxis
+                \instantiates QDateTimeAxis
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/datetimeaxis.qdocinc
+            */
+            #else
             /*!
                 \qmlclass DateTimeAxis QDateTimeAxis
-                \brief The DateTimeAxis element is used for manipulating chart's axes.
-                \inherits AbstractAxis
-                The labels can be configured by setting an appropriate DateTime format.
+                \include ../doc/src/datetimeaxis.qdocinc
-                Note that any date before 4714 BCE or after about 1.4 million CE may not be accurately stored.
-                DateTimeAxis can be setup to show axis line with tick marks, grid lines and shades.
             */
+            #endif
             /*!
               \property QDateTimeAxis::min

0

src/axis/logvalueaxis/qlogvalueaxis.cpp +12 -6

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QLogValueAxis
+                \inmodule Qt Charts
                 \brief The QLogValueAxis class is used for manipulating chart's axis.
                 \mainclass
                 since empty cells in models typically contain zero values.
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype LogValueAxis
+                \instantiates QLogValueAxis
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/logvalueaxis.qdocinc
+            */
+            #else
             /*!
                 \qmlclass LogValueAxis QLogValueAxis
-                \brief The LogValueAxis element is used for manipulating chart's axes.
-                \inherits AbstractAxis
-                \note If a LogValueAxis is attached to a series with one or more points with
+                \include ../doc/src/logvalueaxis.qdocinc
-                negative or zero values on the associated dimension, the series will not be
-                plotted at all. This is particularly relevant when XYModelMappers are used,
-                since empty cells in models typically contain zero values.
             */
+            #endif
             /*!
               \property QLogValueAxis::min

0

src/axis/qabstractaxis.cpp +12 -6

             /*!
                 \class QAbstractAxis
+                \inmodule Qt Charts
                 \brief The QAbstractAxis class is used for manipulating chart's axis.
                 \mainclass
                 Properties and visibility of various axis elements such as axis line, title, labels, grid lines,
                 and shades can be individually controlled.
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype AbstractAxis
+                \instantiates QAbstractAxis
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/abstractaxis.qdocinc
+            */
+            #else
             /*!
                 \qmlclass AbstractAxis QAbstractAxis
-                \brief The AbstractAxis is a base element used for specialized axis elements.
-                Each series can be bound to only one horizontal and vertical axis.
-                Properties and visibility of various axis elements such as axis line, title, labels, grid lines,
+                \include ../doc/src/abstractaxis.qdocinc
-                and shades can be individually controlled.
             */
+            #endif
             /*!
                 \enum QAbstractAxis::AxisType
               \qmlproperty Font AbstractAxis::labelsFont
               The font of the axis labels.
-              See the \l {Font} {QML Font Element} for detailed documentation.
+              See the Qt documentation for more details of Font.
             */
             /*!

0

src/axis/valueaxis/qvalueaxis.cpp +11 -16

@@ -33,6 +33,7
33	QTCOMMERCIALCHART_BEGIN_NAMESPACE	33	QTCOMMERCIALCHART_BEGIN_NAMESPACE
34	/*!	34	/*!
35	\class QValueAxis	35	\class QValueAxis
		36	\inmodule Qt Charts
36	\brief The QValueAxis class is used for manipulating chart's axis.	37	\brief The QValueAxis class is used for manipulating chart's axis.
37	\mainclass	38	\mainclass
38		39
@@ -53,27 +54,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
53	chartView->chart()->setAxisX(axisX, series);	54	chartView->chart()->setAxisX(axisX, series);
54	\endcode	55	\endcode
55	*/	56	*/
		57	#ifdef QDOC_QT5
		58	/*!
		59	\qmltype ValueAxis
		60	\instantiates QValueAxis
		61	\inqmlmodule QtCommercial.Chart
56		62
		63	\include /doc/src/valueaxis.qdocinc
		64	*/
		65	#else
57	/*!	66	/*!
58	\qmlclass ValueAxis QValueAxis	67	\qmlclass ValueAxis QValueAxis
59	\inherits AbstractAxis
60	\brief The ValueAxis element is used for manipulating chart's axes
61
62	ValueAxis can be setup to show axis line with tick marks, grid lines and shades.
63	Values of axis are drawn to position of ticks
64		68
65	Example about using ValueAxis:	69	\include ../doc/src/valueaxis.qdocinc
66	\code
67	ChartView {
68	ValueAxis {
69	id: xAxis
70	min: 0
71	max: 10
72	}
73	// Add a few series...
74	}
75	\endcode
76	*/	70	*/
		71	#endif
77		72
78	/*!	73	/*!
79	\property QValueAxis::min	74	\property QValueAxis::min

0

src/barchart/horizontal/bar/qhorizontalbarseries.cpp +13 -8

             /*!
                 \class QHorizontalBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating horizontal bar chart.
                 \mainclass
                 \sa QBarSet, QBarSeries, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries, QHorizontalStackedBarSeries, QHorizontalPercentBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype HorizontalBarSeries
+                \instantiates QHorizontalBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/horizontalbarseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass HorizontalBarSeries QHorizontalBarSeries
-                \inherits AbstractBarSeries
+                \include ../doc/src/horizontalbarseries.qdocinc
-                The following QML shows how to create a simple horizontal bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View9.qml 1
-                \beginfloatleft
-                \image demos_qmlchart9.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QHorizontalBarSeries.

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +13 -8

             /*!
                 \class QHorizontalPercentBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating horizontal percent bar chart.
                 \mainclass
                 \sa QBarSet, QBarSeries, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries, QHorizontalStackedBarSeries, QHorizontalBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype HorizontalPercentBarSeries
+                \instantiates QHorizontalPercentBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/horizontalpercentbarseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass HorizontalPercentBarSeries QHorizontalPercentBarSeries
-                \inherits QAbstractBarSeries
+                \include ../doc/src/horizontalpercentbarseries.qdocinc
-                The following QML shows how to create a simple horizontal percent bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View11.qml 1
-                \beginfloatleft
-                \image demos_qmlchart11.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QHorizontalPercentBarSeries.

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +13 -8

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QHorizontalStackedBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating horizontal stacked bar chart.
                 \mainclass
                 \sa QBarSet, QBarSeries, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries, QHorizontalPercentBarSeries, QHorizontalBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype HorizontalStackedBarSeries
+                \instantiates QHorizontalStackedBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/horizontalstackedbarseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass HorizontalStackedBarSeries QHorizontalStackedBarSeries
-                \inherits QAbstractBarSeries
+                \include ../doc/src/horizontalstackedbarseries.qdocinc
-                The following QML shows how to create a simple horizontal stacked bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View10.qml 1
-                \beginfloatleft
-                \image demos_qmlchart10.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QHorizontalStackedBarSeries.

0

src/barchart/qabstractbarseries.cpp +12 -8

             /*!
                 \class QAbstractBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating a bar chart.
                 \mainclass
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass AbstractBarSeries QAbstractBarSeries
+                \qmltype AbstractBarSeries
-                \inherits QAbstractSeries
+                \instantiates QAbstractBarSeries
+                \inqmlmodule QtCommercial.Chart
-                The following QML shows how to create a simple bar chart:
+                \include /doc/src/abstractbarseries.qdocinc
-                \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
+            */
+            #else
+            /*!
+                \qmlclass AbstractBarSeries QAbstractBarSeries
-                \beginfloatleft
+                \include ../doc/src/abstractbarseries.qdocinc
-                \image demos_qmlchart6.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 \qmlproperty AbstractAxis AbstractBarSeries::axisX

0

src/barchart/qbarset.cpp +13 -6

             /*!
                 \class QBarSet
+                \inmodule Qt Charts
                 \brief Building block for different bar charts.
                 QBarSet represents one set of bars. Set of bars contains one data value for each category.
                 \sa QAbstractBarSeries, QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype BarSet
+                \instantiates QBarSet
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/barset.qdocinc
+            */
+            #else
             /*!
                 \qmlclass BarSet QBarSet
-                BarSet represents one set of bars. Set of bars contains one data value for each category.
+                \include ../doc/src/barset.qdocinc
-                First value of set is assumed to belong to first category, second to second category and so on.
-                If set has fewer values than there are categories, then the missing values are assumed to be
-                at the end of set. For missing values in middle of a set, numerical value of zero is used.
-                \sa AbstractBarSeries, BarSeries, StackedBarSeries, PercentBarSeries
             */
+            #endif
             /*!
                 \property QBarSet::label
                 \qmlproperty Font BarSet::labelFont
                 Defines the font used by the bar set's label.
-                See the \l {Font} {QML Font Element} for detailed documentation.
+                See the Qt documentation for more details of Font.
             */
             /*!

0

src/barchart/qhbarmodelmapper.cpp +12 -17

@@ -24,6 +24,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QHBarModelMapper	26	\class QHBarModelMapper
		27	\inmodule Qt Charts
27	\brief Horizontal model mapper for bar series.	28	\brief Horizontal model mapper for bar series.
28	\mainclass	29	\mainclass
29		30
@@ -33,27 +34,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33	Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.	34	Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
34	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.	35	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.
35	*/	36	*/
		37	#ifdef QDOC_QT5
36	/*!	38	/*!
37	\qml~~class HBarModelMapper Q~~HBarModelMapper	39	\qmltype HBarModelMapper
		40	\instantiates QHBarModelMapper
		41	\inqmlmodule QtCommercial.Chart
38		42
39	HBarModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source	43	\include /doc/src/hbarmodelmapper.qdocinc
40	for any bar series. It is possible to use both QAbstractItemModel and bar series data API to manipulate data.	44	*/
41	HBarModelMapper keeps the series and the model in sync.	45	#else
		46	/*!
		47	\qmlclass HBarModelMapper QHBarModelMapper
42		48
43	The following QML example would create a bar series with three bar sets (assuming the model has	49	\include ../doc/src/hbarmodelmapper.qdocinc
44	at least four rows). Each bar set would contain data starting from column 1. The name of a set would be defined by
45	the vertical header (of the row).
46	\code
47	BarSeries {
48	HBarModelMapper {
49	model: myCustomModel // QAbstractItemModel derived implementation
50	firstBarSetRow: 1
51	lastBarSetRow: 3
52	firstColumn: 1
53	}
54	}
55	\endcode
56	*/	50	*/
		51	#endif
57		52
58	/*!	53	/*!
59	\property QHBarModelMapper::series	54	\property QHBarModelMapper::series

0

src/barchart/qvbarmodelmapper.cpp +12 -18

@@ -24,6 +24,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QVBarModelMapper	26	\class QVBarModelMapper
		27	\inmodule Qt Charts
27	\brief Vertical model mapper for bar series.	28	\brief Vertical model mapper for bar series.
28	\mainclass	29	\mainclass
29		30
@@ -33,28 +34,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33	Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.	34	Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
34	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.	35	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.
35	*/	36	*/
		37	#ifdef QDOC_QT5
36	/*!	38	/*!
37	\qml~~class~~ VBarModelMapper	39	\qmltype VBarModelMapper
38	\mainclass	40	\instantiates QVBarModelMapper
		41	\inqmlmodule QtCommercial.Chart
39		42
40	VBarModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source	43	\include /doc/src/vbarmodelmapper.qdocinc
41	for any bar series. It is possible to use both QAbstractItemModel and bar series data API to manipulate data.	44	*/
42	VBarModelMapper keeps the series and the model in sync.	45	#else
		46	/*!
		47	\qmlclass VBarModelMapper QVBarModelMapper
43		48
44	The following QML example would create a bar series with three bar sets (assuming the	49	\include ../doc/src/vbarmodelmapper.qdocinc
45	model has at least four columns). Each bar set would contain data starting from row 1. The name of a set would be
46	defined by the horizontal header (of the column).
47	\code
48	BarSeries {
49	VBarModelMapper {
50	model: myCustomModel // QAbstractItemModel derived implementation
51	firstBarSetColumn: 1
52	lastBarSetColumn: 3
53	firstRow: 1
54	}
55	}
56	\endcode
57	*/	50	*/
		51	#endif
58		52
59	/*!	53	/*!
60	\property QVBarModelMapper::series	54	\property QVBarModelMapper::series

0

src/barchart/vertical/bar/qbarseries.cpp +13 -8

             /*!
                 \class QBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating bar chart.
                 \mainclass
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype BarSeries
+                \instantiates QBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/barseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass BarSeries QBarSeries
-                \inherits AbstractBarSeries
+                \include ../doc/src/barseries.qdocinc
-                The following QML shows how to create a simple grouped bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
-                \beginfloatleft
-                \image demos_qmlchart6.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QBarSeries.

0

src/barchart/vertical/percent/qpercentbarseries.cpp +13 -8

             /*!
                 \class QPercentBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating percent bar chart.
                 \mainclass
                 \sa QBarSet, QStackedBarSeries, QAbstractBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype PercentBarSeries
+                \instantiates QPercentBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/persentbarseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass PercentBarSeries QPercentBarSeries
-                \inherits QAbstractBarSeries
+                \include ../doc/src/persentbarseries.qdocinc
-                The following QML shows how to create a simple percent bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View8.qml 1
-                \beginfloatleft
-                \image demos_qmlchart8.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QPercentBarSeries.

0

src/barchart/vertical/stacked/qstackedbarseries.cpp +13 -8

             /*!
                 \class QStackedBarSeries
+                \inmodule Qt Charts
                 \brief Series for creating stacked bar chart.
                 \mainclass
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype StackedBarSeries
+                \instantiates QStackedBarSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/stackedbarseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass StackedBarSeries QStackedBarSeries
-                \inherits AbstractBarSeries
+                \include ../doc/src/stackedbarseries.qdocinc
-                The following QML shows how to create a simple stacked bar chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
-                \beginfloatleft
-                \image demos_qmlchart7.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 Constructs empty QStackedBarSeries.

0

src/boxplotchart/qboxplotseries.cpp +1 0

             /*!
                 \class QBoxPlotSeries
+                \inmodule Qt Charts
                 \brief Series for creating box-and-whiskers chart
                 \mainclass

0

src/boxplotchart/qboxset.cpp +1 0

             /*!
                 \class QBoxSet
+                \inmodule Qt Charts
                 \brief Building block for box-and-whiskers chart
                 QBoxSet represents one box-and-whiskers item. It takes five values to create a graphical representation

0

src/boxplotchart/qvboxplotmodelmapper.cpp +16 -23

             /*!
                 \class QVBoxPlotModelMapper
+                \inmodule Qt Charts
                 \brief Vertical model mapper for bar series
                 \mainclass
                 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
                 Vertical model mapper is used to create a connection between QBoxPlotSeries and QAbstractItemModel derived model object.
                 Model mapper maintains equal size of all the QBoxSets.
-                Note: used model has to support adding/removing rows/columns and modifying the data of the cells.
+                \note used model has to support adding/removing rows/columns and modifying the data of the cells.
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass VBoxPlotModelMapper
+                \qmltype VBoxPlotModelMapper
-                \mainclass
+                \instantiates QVBoxPlotModelMapper
+                \inqmlmodule QtCommercial.Chart
-                VBoxPlotModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
+                \include /doc/src/vboxplotmodelmapper.qdocinc
-                for any box-and-whiskers series. It is possible to use both QAbstractItemModel and box-and-whiskers series data API to
+            */
-                manipulate data.
+            #else
-                VBoxPlotModelMapper keeps the series and the model in sync.
+            /*!
+                \qmlclass VBoxPlotModelMapper QVBoxPlotModelMapper
-                The following QML example would create a box-and-whiskers series with three box sets (assuming the
+                \include ../doc/src/vboxplotmodelmapper.qdocinc
-                model has at least four columns). Each box set would contain data starting from row 1. The name of a set would be
-                defined by the horizontal header (of the column).
-                \code
-                    BarSeries {
-                        VBarModelMapper {
-                            model: myCustomModel // QAbstractItemModel derived implementation
-                            firstBoxSetColumn: 1
-                            lastBoxSetColumn: 3
-                            firstRow: 1
-                \endcode
             */
+            #endif
             /*!
                 \property QVBoxPlotModelMapper::series
                 When new series is specified the old series is disconnected (it preserves its data)
             */
             /*!
-                \qmlproperty AbstractBarSeries VBarModelMapper::series
+                \qmlproperty AbstractBarSeries VBoxPlotModelMapper::series
                 Defines the AbstractBarSeries based object that is used by the mapper. All the data in the series is discarded when it is
                 set to the mapper. When new series is specified the old series is disconnected (it preserves its data).
             */
                 \brief Defines the model that is used by the mapper.
             */
             /*!
-                \qmlproperty SomeModel VBarModelMapper::model
+                \qmlproperty SomeModel VBoxPlotModelMapper::model
                 The QAbstractItemModel based model that is used by the mapper. You need to implement the model
-                and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+                and expose it to QML. \note the model has to support adding/removing rows/columns and modifying
                 the data of the cells.
             */

0

src/legend/qarealegendmarker.cpp +2 -1

             /*!
                 \class QAreaLegendMarker
+                \inmodule Qt Charts
                 \brief QAreaLegendMarker object.
                 \mainclass
                 QAreaLegendMarker is related to QAreaSeries. One QAreaSeries results in one marker.
-                \sa QLegend QAreaSeries
+                \sa QLegend, QAreaSeries
             */
             /*!

0

src/legend/qbarlegendmarker.cpp +2 -1

             /*!
                 \class QBarLegendMarker
+                \inmodule Qt Charts
                 \brief QBarLegendMarker object.
                 \mainclass
                 QBarLegendMarker is related to QAbstractBarSeries derived classes. With bar series, each marker is related to one QBarSet.
-                \sa QLegend QAbstractBarSeries QBarSet
+                \sa QLegend, QAbstractBarSeries, QBarSet
             */
             /*!

0

src/legend/qboxplotlegendmarker.cpp +2 -1

             /*!
                 \class QBoxPlotLegendMarker
+                \inmodule Qt Charts
                 \brief QBoxPlotLegendMarker object
                 \mainclass
                 QBoxPlotLegendMarker is related to QBoxPlotSeries classes.
-                \sa QLegend QBoxPlotSeries
+                \sa QLegend, QBoxPlotSeries
             */
             /*!

0

src/legend/qlegend.cpp +12 -16

@@ -38,6 +38,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
38		38
39	/*!	39	/*!
40	\class QLegend	40	\class QLegend
		41	\inmodule Qt Charts
41	\brief Legend object.	42	\brief Legend object.
42	\mainclass	43	\mainclass
43		44
@@ -50,26 +51,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
50		51
51	\sa QChart	52	\sa QChart
52	*/	53	*/
		54	#ifdef QDOC_QT5
53	/*!	55	/*!
54	\qml~~class Legend Q~~Legend	56	\qmltype Legend
55	\brief Legend is part of Qt Chart QML API.	57	\instantiates QLegend
56		58	\inqmlmodule QtCommercial.Chart
57	Legend is a graphical object, whics displays legend of the chart. Legend state is updated by ChartView, when
58	series have been changed. Legend is used via ChartView class. For example:
59	\code
60	ChartView {
61	legend.visible: true
62	legend.alignment: Qt.AlignBottom
63	// Add a few series...
64	}
65	\endcode
66		59
67	\image examples_percentbarchart_legend.png	60	\include /doc/src/legend.qdocinc
		61	*/
		62	#else
		63	/*!
		64	\qmlclass Legend QLegend
68		65
69	Please note that there is no QML API available for modifying legend markers, unlike in the Qt API of Charts.	66	\include ../doc/src/legend.qdocinc
70	The use case of modifying markers can be implemented for example by creating your own custom legend. For an example
71	on how to do this, see \l {demos/qmlcustomlegend}{Qml Custom Demo} application.
72	*/	67	*/
		68	#endif
73		69
74	/*!	70	/*!
75	\property QLegend::alignment	71	\property QLegend::alignment

0

src/legend/qlegendmarker.cpp +1 0

             /*!
                 \class QLegendMarker
+                \inmodule Qt Charts
                 \brief LegendMarker object.
                 \mainclass

0

src/legend/qpielegendmarker.cpp +2 -1

             /*!
                 \class QPieLegendMarker
+                \inmodule Qt Charts
                 \brief LegendMarker object.
                 \mainclass
                 QPieLegendMarker is related to QPieSeries. With QPieSeries, each slice of pie is related to one marker in QLegend.
-                \sa QLegend QPieSeries QPieSlice
+                \sa QLegend, QPieSeries, QPieSlice
             */
             /*!

0

src/legend/qxylegendmarker.cpp +2 -1

             /*!
                 \class QXYLegendMarker
+                \inmodule Qt Charts
                 \brief QXYLegendMarker object.
                 \mainclass
                 QXYLegendMarker is related to QXYSeries derived classes. Each marker is related to one series.
-                \sa QLegend QXYSeries QSplineSeries QScatterSeries QLineSeries
+                \sa QLegend, QXYSeries, QSplineSeries, QScatterSeries, QLineSeries
             */
             /*!

0

src/linechart/qlineseries.cpp +13 -8

             /*!
                 \class QLineSeries
+                \inmodule Qt Charts
                 \brief The QLineSeries class is used for making line charts.
                 \mainclass
                 chart->addSeries(series);
                 \endcode
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype LineSeries
+                \instantiates QLineSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/lineseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass LineSeries QLineSeries
-                \inherits XYSeries
+                \include ../doc/src/lineseries.qdocinc
-                The following QML shows how to create a simple line chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View2.qml 1
-                \beginfloatleft
-                \image demos_qmlchart2.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 \fn virtual SeriesType QLineSeries::type() const

0

src/piechart/qhpiemodelmapper.cpp +12 -16

@@ -24,6 +24,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QHPieModelMapper	26	\class QHPieModelMapper
		27	\inmodule Qt Charts
27	\mainclass	28	\mainclass
28		29
29	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.	30	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
@@ -31,26 +32,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31	It is possible to use both QAbstractItemModel and QPieSeries model API. QHPieModelMapper makes sure that Pie and the model are kept in sync.	32	It is possible to use both QAbstractItemModel and QPieSeries model API. QHPieModelMapper makes sure that Pie and the model are kept in sync.
32	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.	33	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.
33	*/	34	*/
		35	#ifdef QDOC_QT5
		36	/*!
		37	\qmltype HPieModelMapper
		38	\instantiates QHPieModelMapper
		39	\inqmlmodule QtCommercial.Chart
		40
		41	\include /doc/src/hpiemodelmapper.qdocinc
		42	*/
		43	#else
34	/*!	44	/*!
35	\qmlclass HPieModelMapper QHPieModelMapper	45	\qmlclass HPieModelMapper QHPieModelMapper
36		46
37	HPieModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source	47	\include ../doc/src/hpiemodelmapper.qdocinc
38	for a pie series. It is possible to use both QAbstractItemModel and PieSeries data API to manipulate data.
39	HPieModelMapper keeps the Pie and the model in sync.
40
41	The following QML example would create a pie series with four slices (assuming the model has
42	at least five columns). Each slice would contain a label from row 1 and a value from row 2.
43	\code
44	HPieModelMapper {
45	series: pieSeries
46	model: customModel
47	labelsRow: 1
48	valuesRow: 2
49	firstColumn: 1
50	columnCount: 4
51	}
52	\endcode
53	*/	48	*/
		49	#endif
54		50
55	/*!	51	/*!
56	\property QHPieModelMapper::series	52	\property QHPieModelMapper::series

0

src/piechart/qpieseries.cpp +30 -27

             /*!
                 \class QPieSeries
+                \inmodule Qt Charts
                 \brief Pie series API for Qt Charts.
                 The pie series defines a pie chart which consists of pie slices which are defined as QPieSlice objects.
                 See the \l {PieChart Example} {pie chart example} or \l {DonutChart Example} {donut chart example} to learn how to use QPieSeries.
                 \table 100%
                 \row
-                \o \image examples_piechart.png
+                \li \image examples_piechart.png
-                \o \image examples_donutchart.png
+                \li \image examples_donutchart.png
                 \endtable
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass PieSeries QPieSeries
+                \qmltype PieSeries
-                \inherits AbstractSeries
+                \instantiates QPieSeries
+                \inqmlmodule QtCommercial.Chart
-                The following QML shows how to create a simple pie chart.
-                \snippet ../demos/qmlchart/qml/qmlchart/View1.qml 1
+                \include /doc/src/pieseries.qdocinc
+            */
+            #else
+            /*!
+                \qmlclass PieSeries QPieSeries
-                \beginfloatleft
+                \include ../doc/src/pieseries.qdocinc
-                \image demos_qmlchart1.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 \property QPieSeries::horizontalPosition
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the absolute left.
+                \li 0.0 is the absolute left.
-                \o 1.0 is the absolute right.
+                \li 1.0 is the absolute right.
                 \endlist
                 Default value is 0.5 (center).
                 \sa verticalPosition
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the absolute left.
+                \li 0.0 is the absolute left.
-                \o 1.0 is the absolute right.
+                \li 1.0 is the absolute right.
                 \endlist
                 Default value is 0.5 (center).
                 \sa verticalPosition
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the absolute top.
+                \li 0.0 is the absolute top.
-                \o 1.0 is the absolute bottom.
+                \li 1.0 is the absolute bottom.
                 \endlist
                 Default value is 0.5 (center).
                 \sa horizontalPosition
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the absolute top.
+                \li 0.0 is the absolute top.
-                \o 1.0 is the absolute bottom.
+                \li 1.0 is the absolute bottom.
                 \endlist
                 Default value is 0.5 (center).
                 \sa horizontalPosition
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (pie not drawn).
+                \li 0.0 is the minimum size (pie not drawn).
-                \o 1.0 is the maximum size that can fit the chart.
+                \li 1.0 is the maximum size that can fit the chart.
                 \endlist
                 When setting this property the holeSize property is adjusted if necessary, to ensure that the hole size is not greater than the outer size.
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (pie not drawn).
+                \li 0.0 is the minimum size (pie not drawn).
-                \o 1.0 is the maximum size that can fit the chart.
+                \li 1.0 is the maximum size that can fit the chart.
                 \endlist
                 Default value is 0.7.
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (full pie drawn, without any hole inside).
+                \li 0.0 is the minimum size (full pie drawn, without any hole inside).
-                \o 1.0 is the maximum size that can fit the chart. (donut has no width)
+                \li 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
                 The value is never greater then size property.
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (full pie drawn, without any hole inside).
+                \li 0.0 is the minimum size (full pie drawn, without any hole inside).
-                \o 1.0 is the maximum size that can fit the chart. (donut has no width)
+                \li 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
                 When setting this property the size property is adjusted if necessary, to ensure that the inner size is not greater than the outer size.

0

src/piechart/qpieslice.cpp +13 -12

             /*!
                 \class QPieSlice
+                \inmodule Qt Charts
                 \brief Defines a slice in pie series.
                 This object defines the properties of a single slice in a QPieSeries.
                 To enable user interaction with the pie some basic signals are provided about clicking and hovering.
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass PieSlice QPieSlice
+                \qmltype PieSlice
-                PieSlice defines the properties of a single slice in a PieSeries. The element should be used
+                \instantiates QPieSlice
-                as a child for a PieSeries. For example:
+                \inqmlmodule QtCommercial.Chart
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2
-                An alternative (dynamic) method for adding slices to a PieSeries is using PieSeries.append
+                \include /doc/src/pieslice.qdocinc
-                method.
+            */
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 4
+            #else
+            /*!
+                \qmlclass PieSlice QPieSlice
-                In that case you may want to use PieSeries.at or PieSeries.find to access the properties of
+                \include ../doc/src/pieslice.qdocinc
-                an individual PieSlice instance.
-                \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 5
-                \sa PieSeries
             */
+            #endif
             /*!
              \enum QPieSlice::LabelPosition
                 Defines the font used for slice label.
-                See the \l {Font} {QML Font Element} for detailed documentation.
+                See the Qt documentation for more details of Font.
                 \sa labelVisible, labelPosition
             */

0

src/piechart/qvpiemodelmapper.cpp +12 -16

@@ -24,6 +24,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
24		24
25	/*!	25	/*!
26	\class QVPieModelMapper	26	\class QVPieModelMapper
		27	\inmodule Qt Charts
27	\mainclass	28	\mainclass
28		29
29	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.	30	Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
@@ -31,26 +32,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31	It is possible to use both QAbstractItemModel and QPieSeries model API. QVPieModelMapper makes sure that Pie and the model are kept in sync.	32	It is possible to use both QAbstractItemModel and QPieSeries model API. QVPieModelMapper makes sure that Pie and the model are kept in sync.
32	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.	33	\note Used model has to support adding/removing rows/columns and modifying the data of the cells.
33	*/	34	*/
		35	#ifdef QDOC_QT5
		36	/*!
		37	\qmltype VPieModelMapper
		38	\instantiates QVPieModelMapper
		39	\inqmlmodule QtCommercial.Chart
		40
		41	\include /doc/src/vpiemodelmapper.qdocinc
		42	*/
		43	#else
34	/*!	44	/*!
35	\qmlclass VPieModelMapper QVPieModelMapper	45	\qmlclass VPieModelMapper QVPieModelMapper
36		46
37	VPieModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source	47	\include ../doc/src/vpiemodelmapper.qdocinc
38	for a pie series. It is possible to use both QAbstractItemModel and PieSeries data API to manipulate data.
39	VPieModelMapper keeps the Pie and the model in sync.
40
41	The following QML example would create a pie series with four slices (assuming the model has at least five rows).
42	Each slice would contain a label from column 1 and a value from column 2.
43	\code
44	VPieModelMapper {
45	series: pieSeries
46	model: customModel
47	labelsColumn: 1
48	valuesColumn: 2
49	firstRow: 1
50	rowCount: 4
51	}
52	\endcode
53	*/	48	*/
		49	#endif
54		50
55	/*!	51	/*!
56	\property QVPieModelMapper::series	52	\property QVPieModelMapper::series

0

src/qabstractseries.cpp +14 -3

             /*!
                 \class QAbstractSeries
+                \inmodule Qt Charts
                 \brief Base class for all Qt Chart series.
                 \mainclass
                 \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QAbstractBarSeries, QStackedBarSeries,
                 QPercentBarSeries, QPieSeries
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass AbstractSeries
+                \qmltype AbstractSeries
-                AbstractSeries is the base class for all series.
+                \instantiates QAbstractSeries
-                The class cannot be instantiated by the user.
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/abstractseries.qdocinc
+            */
+            #else
+            /*!
+                \qmlclass AbstractSeries QAbstractSeries
+                \include ../doc/src/abstractseries.qdocinc
             */
+            #endif
             /*!
                 \enum QAbstractSeries::SeriesType

0

src/qchart.cpp +13 -12

             /*!
              \class QChart
+             \inmodule Qt Charts
              \brief Main chart API for Qt Charts.
              QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
              \table
                  \header
-                     \o Series type
+                     \li Series type
-                     \o X-axis
+                     \li X-axis
-                     \o Y-axis
+                     \li Y-axis
                  \row
-                     \o QXYSeries
+                     \li QXYSeries
-                     \o QValueAxis
+                     \li QValueAxis
-                     \o QValueAxis
+                     \li QValueAxis
                  \row
-                     \o QBarSeries
+                     \li QBarSeries
-                     \o QBarCategoryAxis
+                     \li QBarCategoryAxis
-                     \o QValueAxis
+                     \li QValueAxis
                  \row
-                     \o QPieSeries
+                     \li QPieSeries
-                     \o None
+                     \li None
-                     \o None
+                     \li None
              \endtable
              If there are several QXYSeries derived series added to the chart and no series of other types have been added, then only one pair of axes is created.

0

src/qchartview.cpp +1 0

             /*!
                 \class QChartView
+                \inmodule Qt Charts
                 \brief Standalone charting widget.
                 QChartView is a standalone widget that can display charts. It does not require separate

0

src/qpolarchart.cpp +1 0

             /*!
              \class QPolarChart
+             \inmodule Qt Charts
              \brief Polar chart API for Qt Charts.
              QPolarChart is a specialization of QChart to show a polar chart.

0

src/scatterchart/qscatterseries.cpp +12 -8

             /*!
                 \class QScatterSeries
+                \inmodule Qt Charts
                 \brief The QScatterSeries class is used for making scatter charts.
                 \mainclass
                 chart->addSeries(series);
                 \endcode
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass ScatterSeries QScatterSeries
+                \qmltype ScatterSeries
-                \inherits XYSeries
+                \instantiates QScatterSeries
+                \inqmlmodule QtCommercial.Chart
-                The following QML shows how to create a chart with two simple scatter series:
+                \include /doc/src/scatterseries.qdocinc
-                \snippet ../demos/qmlchart/qml/qmlchart/View5.qml 1
+            */
+            #else
+            /*!
+                \qmlclass ScatterSeries QScatterSeries
-                \beginfloatleft
+                \include ../doc/src/scatterseries.qdocinc
-                \image demos_qmlchart5.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 \enum QScatterSeries::MarkerShape

0

src/splinechart/qsplineseries.cpp +12 -8

             /*!
                 \class QSplineSeries
+                \inmodule Qt Charts
                 \brief Series type used to store data needed to draw a spline.
                 QSplineSeries stores the data points along with the segment control points needed by QPainterPath to draw spline
                 chart->addSeries(series);
                 \endcode
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype SplineSeries
+                \instantiates QSplineSeries
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/splineseries.qdocinc
+            */
+            #else
             /*!
                 \qmlclass SplineSeries QSplineSeries
-                \inherits XYSeries
+                \include ../doc/src/splineseries.qdocinc
-                The following QML shows how to create a simple spline chart:
-                \snippet ../demos/qmlchart/qml/qmlchart/View3.qml 1
-                \beginfloatleft
-                \image demos_qmlchart3.png
-                \endfloat
-                \clearfloat
             */
+            #endif
             /*!
                 \fn QSeriesType QSplineSeries::type() const

0

src/xychart/qhxymodelmapper.cpp +12 -3

             /*!
                 \class QHXYModelMapper
+                \inmodule Qt Charts
                 \mainclass
                 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
                 It is possible to use both QAbstractItemModel and QXYSeries model API. QXYModelMapper makes sure that QXYSeries and the model are kept in sync.
                 Note: used model has to support adding/removing rows/columns and modifying the data of the cells.
             */
+            #ifdef QDOC_QT5
+            /*!
+                \qmltype HXYModelMapper
+                \instantiates QHXYModelMapper
+                \inqmlmodule QtCommercial.Chart
+                \include /doc/src/hxymodelmapper.qdocinc
+            */
+            #else
             /*!
                 \qmlclass HXYModelMapper QHXYModelMapper
-                HXYModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as a data source
+                \include ../doc/src/hxymodelmapper.qdocinc
-                for XYSeries based series. It is possible to use both QAbstractItemModel and XYSeries data API to manipulate data.
-                HXYModelMapper keeps the series and the model in sync.
             */
+            #endif
             /*!
                 \property QHXYModelMapper::series

0

src/xychart/qvxymodelmapper.cpp +13 -4

             /*!
                 \class QVXYModelMapper
+                \inmodule Qt Charts
                 \mainclass
                 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
                 It is possible to use both QAbstractItemModel and QXYSeries model API. QXYModelMapper makes sure that QXYSeries and the model are kept in sync.
                 Note: used model has to support adding/removing rows/columns and modifying the data of the cells.
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass VXYModelMapper QHXYModelMapper
+                \qmltype VXYModelMapper
+                \instantiates QVXYModelMapper
+                \inqmlmodule QtCommercial.Chart
-                VXYModelMapper allows you to use your own QAbstractItemModel derived model with data in columns as a data source
+                \include /doc/src/vxymodelmapper.qdocinc
-                for XYSeries based series. It is possible to use both QAbstractItemModel and XYSeries data API to manipulate data.
-                VYModelMapper keeps the series and the model in sync.
             */
+            #else
+            /*!
+                \qmlclass VXYModelMapper QVXYModelMapper
+                \include ../doc/src/vxymodelmapper.qdocinc
+            */
+            #endif
             /*!
                 \property QVXYModelMapper::series

0

src/xychart/qxyseries.cpp +13 -4

             /*!
                 \class QXYSeries
+                \inmodule Qt Charts
                 \brief The QXYSeries class is a base class for line, spline and scatter series.
             */
+            #ifdef QDOC_QT5
             /*!
-                \qmlclass XYSeries
+                \qmltype XYSeries
-                \inherits AbstractSeries
+                \instantiates QXYSeries
-                The XYSeries class is a base class for line, spline and scatter series.
+                \inqmlmodule QtCommercial.Chart
-                The class cannot be instantiated directly.
+                \include /doc/src/xyseries.qdocinc
             */
+            #else
+            /*!
+                \qmlclass XYSeries QXYSeries
+                \include ../doc/src/xyseries.qdocinc
+            */
+            #endif
             /*!
                 \qmlproperty AbstractAxis XYSeries::axisX

0

plugins/declarative/font.qdoc removed 0 -114

1

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages