diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-01 01:00:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-01 13:19:03 +0200 |
| commit | 9d8c309e27c87ce8a5c58f7f03de535ce999ff24 (patch) | |
| tree | 37db3e8626bb34b6dac078c1762ff299af90a29a /src/quick/items/qquickitem.cpp | |
| parent | f294fda40c19c0ecc3c99efb3aabe1b14933cc84 (diff) | |
| parent | a30138cae86268d71415bc88cfba157977f4a442 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I654a2a4b34dadc7cb7d85625b86f54691ad5904a
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index c23aca622e..6b5d595c26 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1817,10 +1817,10 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) \section1 Custom Scene Graph Items - All visual QML items are rendered using the scene graph, a - low-level, high-performance rendering stack, closely tied to - OpenGL. It is possible for subclasses of QQuickItem to add their - own custom content into the scene graph by setting the + All visual QML items are rendered using the scene graph, the default + implementation of which is a low-level, high-performance rendering stack, + closely tied to OpenGL. It is possible for subclasses of QQuickItem to add + their own custom content into the scene graph by setting the QQuickItem::ItemHasContents flag and reimplementing the QQuickItem::updatePaintNode() function. |