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/callout.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/callout.h')
| -rw-r--r-- | examples/charts/callout/callout.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/examples/charts/callout/callout.h b/examples/charts/callout/callout.h index 35de08d5..67cc76ff 100644 --- a/examples/charts/callout/callout.h +++ b/examples/charts/callout/callout.h @@ -30,6 +30,7 @@ #ifndef CALLOUT_H #define CALLOUT_H +#include <QtCharts/QChartGlobal> #include <QtWidgets/QGraphicsItem> #include <QtGui/QFont> @@ -37,13 +38,20 @@ QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; QT_END_NAMESPACE +QT_CHARTS_BEGIN_NAMESPACE +class QChart; +QT_CHARTS_END_NAMESPACE + +QT_CHARTS_USE_NAMESPACE + class Callout : public QGraphicsItem { public: - Callout(QGraphicsItem * parent = 0); + Callout(QChart *parent); void setText(const QString &text); void setAnchor(QPointF point); + void updateGeometry(); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,QWidget *widget); @@ -58,6 +66,7 @@ private: QRectF m_rect; QPointF m_anchor; QFont m_font; + QChart *m_chart; }; #endif // CALLOUT_H |