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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 1c7f1ca6aa..f39e8e0316 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2969,6 +2969,8 @@ void QQuickText::setRenderType(QQuickText::RenderType renderType) d->updateLayout(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#if QT_DEPRECATED_SINCE(5, 15) /*! \qmlmethod QtQuick::Text::doLayout() \deprecated @@ -2980,6 +2982,8 @@ void QQuickText::doLayout() forceLayout(); } +#endif +#endif /*! \qmlmethod QtQuick::Text::forceLayout() \since 5.9 |