diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-23 14:55:35 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@digia.com> | 2013-10-28 10:19:05 +0200 |
commit | 2ce3423968b53608871b5fd75c202c0699f569b4 (patch) | |
tree | 2dbc27f2e1ef877de545d5c105d224180d6b1f79 /plugins/declarative/declarativechart.cpp | |
parent | c98d8af1763df3e8f3c2b8b2117ebcd882b6b16d (diff) |
Fix Charts documentation
The documentation structure is changed so that it can be generated with
both Qt5 and Qt4.
Also the erroneous VBarModelMapper is removed from VBoxPlotModelMapper
documentation.
Task-number: QTRD-2492, QTRD-2495
Change-Id: I45028915ca55f6ff1170db58518a8f08ac4158fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'plugins/declarative/declarativechart.cpp')
-rw-r--r-- | plugins/declarative/declarativechart.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index 005fd667..8364f0e7 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -52,21 +52,21 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE +#ifdef QDOC_QT5 /*! - \qmlclass ChartView DeclarativeChart - - ChartView element is the parent that is responsible for showing different chart series types. + \qmltype ChartView + \instantiates DeclarativeChart + \inqmlmodule QtCommercial.Chart - The following QML shows how to create a simple chart with one pie series: - \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 1 - \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 2 - \snippet ../examples/qmlpiechart/qml/qmlpiechart/main.qml 3 + \include /doc/src/chartview.qdocinc +*/ +#else +/*! + \qmlclass ChartView DeclarativeChart - \beginfloatleft - \image examples_qmlpiechart.png - \endfloat - \clearfloat + \include ../doc/src/chartview.qdocinc */ +#endif /*! \qmlproperty Theme ChartView::theme @@ -82,9 +82,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! \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. */ /*! |