diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 08:23:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 09:13:20 +0200 |
| commit | d352d707f95c3c4e213585361a3ec737389e301e (patch) | |
| tree | 492cd77328b19731cecbd5470d9c667d78d75e79 /examples/charts/callout/view.h | |
| parent | a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 (diff) | |
| parent | 7a0be48ac39243d139cc4a78423ca033d5d90b3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
README
src/charts/qchartglobal.h
tests/auto/chartdataset/tst_chartdataset.cpp
tests/auto/domain/tst_domain.cpp
Change-Id: Ib4e01f2646d87b691c7b2f8bee4ed1f5521e4f6d
Diffstat (limited to 'examples/charts/callout/view.h')
| -rw-r--r-- | examples/charts/callout/view.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/charts/callout/view.h b/examples/charts/callout/view.h index 4744a1c3..4d17461b 100644 --- a/examples/charts/callout/view.h +++ b/examples/charts/callout/view.h @@ -66,6 +66,7 @@ private: QGraphicsSimpleTextItem *m_coordY; QChart *m_chart; Callout *m_tooltip; + QList<Callout *> m_callouts; }; #endif |