diff options
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 12 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 2e17b0463c..42444f36be 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -167,12 +167,12 @@ private Q_SLOTS: void invalidateSG(); protected: - void componentComplete(); - void itemChange(QQuickItem::ItemChange, const QQuickItem::ItemChangeData &); - void updatePolish(); - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - void releaseResources(); + void componentComplete() Q_DECL_OVERRIDE; + void itemChange(QQuickItem::ItemChange, const QQuickItem::ItemChangeData &) Q_DECL_OVERRIDE; + void updatePolish() Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void releaseResources() Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QQuickCanvasItem) Q_INVOKABLE void delayedCreate(); diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp index 7b114ae45e..ee6f723d19 100644 --- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp @@ -101,7 +101,7 @@ namespace { } void paint(QPainter *p) const { p->fillRect(m_rect, m_brush); } - QRectF boundingRect() const { return m_rect; } + QRectF boundingRect() const Q_DECL_OVERRIDE { return m_rect; } private: QRectF m_rect; @@ -118,7 +118,7 @@ namespace { } void paint(QPainter *p) const { p->fillPath(m_path, m_brush); } - QRectF boundingRect() const { return m_path.boundingRect(); } + QRectF boundingRect() const Q_DECL_OVERRIDE { return m_path.boundingRect(); } private: QPainterPath m_path; @@ -136,7 +136,7 @@ namespace { void paint(QPainter *p) const { p->strokePath(m_path, m_pen); } - QRectF boundingRect() const + QRectF boundingRect() const Q_DECL_OVERRIDE { qreal d = qMax(qreal(1), m_pen.widthF()); return m_path.boundingRect().adjusted(-d, -d, d, d); @@ -158,7 +158,7 @@ namespace { void paint(QPainter *p) const { p->drawImage(m_offset, m_image); } - QRectF boundingRect() const { return QRectF(m_image.rect()).translated(m_offset); } + QRectF boundingRect() const Q_DECL_OVERRIDE { return QRectF(m_image.rect()).translated(m_offset); } private: QImage m_image; |