diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:53:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:53:34 +0100 |
| commit | e0ba5ac91dbb1fe3611118239c00ea8d748e5678 (patch) | |
| tree | 6af4ef967b16505dac93557b918b94fcb77c7535 /src/chartsqml2/declarativemargins.cpp | |
| parent | 1fea2116072f96a86daec092e54fe658651a4034 (diff) | |
| parent | 7a66c005af12918bde79665659eee3c49f30b650 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/charts/barchart/qbarset.cpp
Change-Id: Id57f9d6ac8cdf996a6bc77780e4a3ee97cae66d6
Diffstat (limited to 'src/chartsqml2/declarativemargins.cpp')
| -rw-r--r-- | src/chartsqml2/declarativemargins.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp index 3eadeb08..a4284dbc 100644 --- a/src/chartsqml2/declarativemargins.cpp +++ b/src/chartsqml2/declarativemargins.cpp @@ -37,9 +37,13 @@ QT_CHARTS_BEGIN_NAMESPACE \qmltype Margins \inqmlmodule QtCharts - \brief Type is used to define margins. + \brief Defines margins between the edge of the chart rectangle and the plot + area. - Uncreatable type that is used to define top, bottom, left and right margins. + An uncreatable type that is used to define the top, bottom, left, and right + margins. The margins are used for drawing the title, axes, and legend. + + \sa {ChartView::margins}{ChartView.margins} */ /*! |