diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
| commit | 0932a59971f606f07b41da19f3974d51b7008180 (patch) | |
| tree | 191aab5e88e7b4ddf3724dcbf3b8229512e433f2 /src/quick/scenegraph/coreapi/qsgnode.cpp | |
| parent | aca40a8361996e22ec4f020b803404031a0f0d76 (diff) | |
| parent | cd0efef04bd45eca6cc72b5a000e4e5586153290 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Part of 0e053528 was reverted in the merge, about lastTimestamp. It
will be applied later in separate commit.
qmltest::shadersource-dynamic-sourceobject::test_endresult() was
blacklisted on linux.
Conflicts:
.qmake.conf
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
tests/auto/qmltest/BLACKLIST
tests/auto/qmltest/qmltest.pro
Task-number: QTBUG-53590
Task-number: QTBUG-53971
Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index 223c555f3e..53798f0e07 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -337,12 +337,12 @@ QSGNode::~QSGNode() to the scene graph and will cause the preprocess() function to be called for every frame the node is rendered. - The preprocess function is called before the update pass that propegates + The preprocess function is called before the update pass that propagates opacity and transformations through the scene graph. That means that functions like QSGOpacityNode::combinedOpacity() and QSGTransformNode::combinedMatrix() will not contain up-to-date values. If such values are changed during the preprocess, these changes will be - propegated through the scene graph before it is rendered. + propagated through the scene graph before it is rendered. \warning Beware of deleting nodes while they are being preprocessed. It is possible, with a small performance hit, to delete a single node during its @@ -1337,7 +1337,7 @@ const qreal OPACITY_THRESHOLD = 0.001; Sets the opacity of this node to \a opacity. Before rendering the graph, the renderer will do an update pass - over the subtree to propegate the opacity to its children. + over the subtree to propagate the opacity to its children. The value will be bounded to the range 0 to 1. */ |