diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:59:57 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:59:57 +0100 |
commit | b67d79067515c3f34a8b84fee9fef8484fbdad76 (patch) | |
tree | 638ff84179a564306f3037ca1c95947982650506 /src/compositor/compositor_api/qwaylandquickitem.cpp | |
parent | 06230d22488796d92ea130e985d1e0ee2ed05199 (diff) | |
parent | 9f1db9d0ae60ffe8be1453a57be3b8f2861e4882 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/compositor/extensions/extensions.pri
Change-Id: Ia9a5bd52b7cac9a4f66e7c5deb43d89f0c792325
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 5414d06ae..735793ea2 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1066,14 +1066,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 |