diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-15 16:02:44 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-20 09:26:09 +0000 |
| commit | ba1bc44f31dcdf4d3fe84f53e45e8bb32c68a22a (patch) | |
| tree | a33527ff4dbb537f482d302a1f62efe1334a5ea6 /src/quick/items/qquicktextdocument_p.h | |
| parent | 2de792d92dd8af9465ba892e1cf9ab029ff18ad5 (diff) | |
Quick items: add missing 'override'
... and drop redundant 'virtual'
Change-Id: I1b1a85c859077e813a423743f661ef616ca7252b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextdocument_p.h')
| -rw-r--r-- | src/quick/items/qquicktextdocument_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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); |