diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:01:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:01:10 +0100 |
| commit | 79d66c6ead287da8d5436d1b3513b8524eb2b197 (patch) | |
| tree | 360efde45809def302bc3a0212c167877416f9ae | |
| parent | 60d6d83ea0c43462d5f8e17aaa654ab6f625dd6e (diff) | |
| parent | 2824a71e5c28ec1843edc056f2c17c6274378f1d (diff) | |
| download | qtwayland-79d66c6ead287da8d5436d1b3513b8524eb2b197.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1b00775ff2d9ede97dbcd9f9deb9f2a947cf1ae5
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 6e41c7c0..2b31bc90 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -825,7 +825,7 @@ void QWaylandQuickItem::setOutput(QWaylandOutput *output) } /*! - * \property QWaylandQuickItem::bufferLocked + * \property QWaylandQuickItem::isBufferLocked * * This property holds whether the item's buffer is currently locked. As long as * the buffer is locked, it will not be released and returned to the client. @@ -1265,7 +1265,7 @@ void QWaylandQuickItem::updateInputMethod(Qt::InputMethodQueries queries) * If an animation is started, bufferLocked should be set to ensure the item keeps its content * until the animation finishes * - * \sa bufferLocked + * \sa isBufferLocked */ /*! |