diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-05 21:23:44 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-06 09:54:17 +0200 |
| commit | 660b38bb2c4a7650ed04dc0f2feb2bf93d4e6739 (patch) | |
| tree | a55842c2d648151560354a0fccd45efbfeddb681 /src/gui/painting/qpainterpath.h | |
| parent | d39fefc0ebc8481dd695be031d9479a6ee397612 (diff) | |
Remove a bunch of deprecated members from src/gui/painting classes
Also remove dead code that isn't compiled anymore in Qt 6 builds.
Change-Id: I7a7ae35e61fb2ad9cc21180fb7224357ade1505f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/painting/qpainterpath.h')
| -rw-r--r-- | src/gui/painting/qpainterpath.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index aa43c74bee..0b006d466c 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -142,19 +142,6 @@ public: qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") - void addRoundRect(const QRectF &rect, int xRnd, int yRnd); - QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") - void addRoundRect(qreal x, qreal y, qreal w, qreal h, - int xRnd, int yRnd); - QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") - void addRoundRect(const QRectF &rect, int roundness); - QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") - void addRoundRect(qreal x, qreal y, qreal w, qreal h, - int roundness); -#endif - void connectPath(const QPainterPath &path); bool contains(const QPointF &pt) const; @@ -196,10 +183,6 @@ public: Q_REQUIRED_RESULT QPainterPath united(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath intersected(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath subtracted(const QPainterPath &r) const; -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use r.subtracted() instead") - Q_REQUIRED_RESULT QPainterPath subtractedInverted(const QPainterPath &r) const; -#endif Q_REQUIRED_RESULT QPainterPath simplified() const; |