diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-22 10:35:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:20:29 +0100 |
| commit | 1b4d2741f90d3f4daf79940b9c8713dda0fb7f3d (patch) | |
| tree | 40cee4f6af7bf9a5fc87c43f024f417a5d09e18d /src/quick/items/qquickitem.cpp | |
| parent | 536868fad50778ec5bf4c6c7269c721b05d8a2d5 (diff) | |
| parent | 84e15a609b37a64baf82ed20f8d4f79474989226 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
Change-Id: Ic1f5e219a255d0613f7654368a5ce3eccb8f0ee9
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 0cd4c446d9..ec6bf5a1b8 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -4800,7 +4800,7 @@ QQuickItem *QQuickItem::nextItemInFocusChain(bool forward) Returns the first visible child item found at point (\a x, \a y) within the coordinate system of this item. - Returns 0 if there is no such item. + Returns \nullptr if there is no such item. */ QQuickItem *QQuickItem::childAt(qreal x, qreal y) const { @@ -7224,7 +7224,7 @@ bool QQuickItem::isFocusScope() const If this item is a focus scope, this returns the item in its focus chain that currently has focus. - Returns 0 if this item is not a focus scope. + Returns \nullptr if this item is not a focus scope. */ QQuickItem *QQuickItem::scopedFocusItem() const { @@ -8160,7 +8160,7 @@ bool QQuickItem::isTextureProvider() const \fn QSGTextureProvider *QQuickItem::textureProvider() const Returns the texture provider for an item. The default implementation - returns 0. + returns \nullptr. This function may only be called on the rendering thread. */ |