diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 03:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-26 03:00:10 +0100 |
| commit | a9149e59b50f80381158158de35d8a8d63707747 (patch) | |
| tree | 1d942a38fb0be7d76c84f650d4d79f0718e78bbf | |
| parent | b957ead17811879eb4ed513d4a78696c51de76d9 (diff) | |
| parent | fc535855c4f7e2b457b2a71fb3b687855cbfc958 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I932a92d9ad469c1de7a35f291bbdbc70aeb8858f
| -rw-r--r-- | src/charts/areachart/qareaseries.cpp | 5 | ||||
| -rw-r--r-- | src/charts/scatterchart/qscatterseries.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp index f8401785..fd473c72 100644 --- a/src/charts/areachart/qareaseries.cpp +++ b/src/charts/areachart/qareaseries.cpp @@ -196,6 +196,11 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! + \qmlproperty brush AreaSeries::brush + The brush used to draw to draw the line for this series. +*/ + +/*! \qmlproperty QString AreaSeries::brushFilename The name of the file used as a brush image for the series. */ diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp index fe58fd9e..ee4ff411 100644 --- a/src/charts/scatterchart/qscatterseries.cpp +++ b/src/charts/scatterchart/qscatterseries.cpp @@ -100,6 +100,11 @@ */ /*! + \qmlproperty brush ScatterSeries::brush + The brush used to draw the scatter series markers. +*/ + +/*! \property QScatterSeries::color \brief The color used to fill the series markers. |