diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:48:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 09:00:45 +0200 |
commit | a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 (patch) | |
tree | 6d4835511c823e1ebff312869e51c9ff949f85ad /src/charts/xychart/xychart_p.h | |
parent | c121fb4ad00bc9617a011e040ef5ed695610a504 (diff) | |
parent | 64d931d5fc5f17b8c4875f6c59f900aa59080881 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/charts/glwidget.cpp
src/charts/xychart/glxyseriesdata_p.h
src/chartsqml2/declarativerendernode.cpp
Change-Id: I611ff3a7874ceb7dddcf0f4d069927a9899a986d
Diffstat (limited to 'src/charts/xychart/xychart_p.h')
-rw-r--r-- | src/charts/xychart/xychart_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index c0348c18..c5737cca 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -88,6 +88,7 @@ Q_SIGNALS: protected: virtual void updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index = -1); virtual void updateGlChart(); + virtual void refreshGlChart(); private: inline bool isEmpty(); |