diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-09-29 08:55:32 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-10-04 14:02:11 +0800 |
| commit | 0c18f4d68d1a2ceb9e114d3964e70df228ab3ba4 (patch) | |
| tree | ed734e20e1c61ded7f46bb40ddee620a4c56d78a /src/qmltest | |
| parent | 8f898cb64d5fdd97da2eb8ac2d07fda0f1799cad (diff) | |
Doc: fix since/deprecation versions for TestCase change that missed 6.4
a72b4cd733cc1d82e7c0d877b75f93b96aa980bd was apparently merged on the
same day - but right after - 6.4 was branched from dev. Fix the
documentation to account for this.
The C++ change (36c6c1ea57ad503a2f42fe81a12d1254fcd38cca) was merged
in time.
Task-number: QTBUG-93757
Change-Id: I929ef934ab316535f556c3cc2cf07d483cfbf8c1
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/TestCase.qml | 6 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmltest/TestCase.qml b/src/qmltest/TestCase.qml index 8c1805901f..b7848a9fd7 100644 --- a/src/qmltest/TestCase.qml +++ b/src/qmltest/TestCase.qml @@ -491,7 +491,7 @@ Item { \l {QQuickItem::}{updatePolish()} has not been called on it since the last call to \l {QQuickItem::}{polish()}, otherwise returns \c false. - Since Qt 6.4, if \a itemOrWindow is a \l Window, this function returns + Since Qt 6.5, if \a itemOrWindow is a \l Window, this function returns \c true if \l {QQuickItem::}{updatePolish()} has not been called on any item it manages since the last call to \l {QQuickItem::}{polish()} on those items, otherwise returns \c false. @@ -528,7 +528,7 @@ Item { /*! \since 5.13 - \deprecated [6.4] Use \l qWaitForPolish() instead. + \deprecated [6.5] Use \l waitForPolish() instead. \qmlmethod bool waitForItemPolished(object item, int timeout = 5000) Waits for \a timeout milliseconds or until @@ -544,7 +544,7 @@ Item { } /*! - \since 6.4 + \since 6.5 \qmlmethod bool waitForPolish(object windowOrItem, int timeout = 5000) If \a windowOrItem is an Item, this functions waits for \a timeout diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 77de774a53..d0ae853f86 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -130,7 +130,7 @@ public Q_SLOTS: Q_REVISION(1, 1) QObject *findChild(QObject *parent, const QString &objectName); Q_REVISION(1, 13) bool isPolishScheduled(QObject *itemOrWindow) const; - Q_REVISION(6, 4) bool waitForPolish(QObject *itemOrWindow, int timeout) const; + Q_REVISION(6, 5) bool waitForPolish(QObject *itemOrWindow, int timeout) const; public: // Helper functions for the C++ main() shell. |