From ba1bc44f31dcdf4d3fe84f53e45e8bb32c68a22a Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Thu, 15 Sep 2016 16:02:44 +0300 Subject: Quick items: add missing 'override' ... and drop redundant 'virtual' Change-Id: I1b1a85c859077e813a423743f661ef616ca7252b Reviewed-by: Ulf Hermann --- src/quick/items/qquicktextdocument_p.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquicktextdocument_p.h') diff --git a/src/quick/items/qquicktextdocument_p.h b/src/quick/items/qquicktextdocument_p.h index 3ffedb5b96..fd40669557 100644 --- a/src/quick/items/qquicktextdocument_p.h +++ b/src/quick/items/qquicktextdocument_p.h @@ -75,8 +75,8 @@ public: void setText(const QString &); int resourcesLoading() const { return outstanding; } - QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format); - void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format); + QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) override; + void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) override; QImage image(const QTextImageFormat &format); @@ -87,7 +87,7 @@ Q_SIGNALS: void imagesLoaded(); protected: - QVariant loadResource(int type, const QUrl &name); + QVariant loadResource(int type, const QUrl &name) override; QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name); -- cgit v1.2.3