diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:54 +0100 |
| commit | 5ba68be0ff9cd14c0742239af714c40d00718f48 (patch) | |
| tree | e224eee0340bdf6528437151459720a2c5202603 /src/compositor/compositor_api/qwaylandquickitem.cpp | |
| parent | 062e7bffc7a60ebe3bb95fc736aabbafbb01cf6b (diff) | |
| parent | b67d79067515c3f34a8b84fee9fef8484fbdad76 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I851b9b1bdfaa8be403d69f43b82a3f745038cc1c
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.cpp')
| -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 ff9043315..74ce326e5 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1080,14 +1080,14 @@ QVariant QWaylandQuickItem::inputMethodQuery(Qt::InputMethodQuery query, QVarian Returns true if the item is hidden, though the texture is still updated. As opposed to hiding the item by - setting \l{Item::visible}{visible} to \c false, setting this property to \c true + setting \l{Item::visible}{visible} to \c false, setting this property to \c false will not prevent mouse or keyboard input from reaching item. */ /*! Returns true if the item is hidden, though the texture is still updated. As opposed to hiding the item by - setting \l{Item::visible}{visible} to \c false, setting this property to \c true + setting \l{Item::visible}{visible} to \c false, setting this property to \c false will not prevent mouse or keyboard input from reaching item. */ bool QWaylandQuickItem::paintEnabled() const |