diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-20 10:18:47 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-20 13:04:29 +0100 |
| commit | d58be5058cc5b7bda9cffd76512e2888f543f119 (patch) | |
| tree | 8275d9e92f43d95ab1231b3b328ee4e61a598369 /sources/pyside6/PySide6/qpytextobject.h | |
| parent | 9577e5029538d26d139673b2a915ce206b50c68d (diff) | |
Fix building against a Qt developer build
Remove redeclarations of QPyTextObject::drawObject(),
QPyTextObject::intrinsicSize() which should be taken from
QTextObjectInterface, fixing:
sources/pyside6/PySide6/qpytextobject.h:58:10: error: ‘virtual void QPyTextObject::drawObject(QPainter*, const QRectF&, QTextDocument*, int, const QTextFormat&)’ can be marked override [-Werror=suggest-override]
sources/pyside6/PySide6/qpytextobject.h:60:12: error: ‘virtual QSizeF QPyTextObject::intrinsicSize(QTextDocument*, int, const QTextFormat&)’ can be marked override [-Werror=suggest-override]
cc1plus: all warnings being treated as errors
Change-Id: I904ee7b66b738438f96cdaa8a934a10c4fe7d5a6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/qpytextobject.h')
| -rw-r--r-- | sources/pyside6/PySide6/qpytextobject.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/qpytextobject.h b/sources/pyside6/PySide6/qpytextobject.h index 1968ac385..ee07a53dc 100644 --- a/sources/pyside6/PySide6/qpytextobject.h +++ b/sources/pyside6/PySide6/qpytextobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Python. @@ -55,9 +55,6 @@ class QPyTextObject : public QObject, public QTextObjectInterface Q_INTERFACES(QTextObjectInterface) public: QPyTextObject(QObject *parent = nullptr) : QObject(parent) {} - void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, - int posInDocument, const QTextFormat &format) = 0; - QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) = 0; }; #endif |