diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-25 16:42:15 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-28 17:08:28 +0100 |
| commit | 8319597ae30219c71aef9d2086e8e8294802686c (patch) | |
| tree | f785bb023f03b43813ca5a19a558bbd09bff0379 /src/quick/items/qquicktext_p.h | |
| parent | e0bbea53f92648e004b162428e36dcdd8cf95cf1 (diff) | |
Properly deprecate QQuickText::doLayout() and get rid of it for Qt6
It was only deprecated through its documentation.
Change-Id: I0b7bdeec4ed965c3df627a03ab0e539c4e9c2018
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquicktext_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index b64751b6f4..0fffc1fb9a 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -223,7 +223,12 @@ public: QRectF boundingRect() const override; QRectF clipRect() const override; - Q_INVOKABLE void doLayout(); // ### Qt 6: remove +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#if QT_DEPRECATED_SINCE(5, 15) + QT_DEPRECATED_X("Use forceLayout() instead") + Q_INVOKABLE void doLayout(); +#endif +#endif Q_REVISION(9) Q_INVOKABLE void forceLayout(); RenderType renderType() const; |