diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:30:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-06-06 15:59:38 +0200 |
| commit | c254cec22a2352a3fcab60244a6ab74f95d45ace (patch) | |
| tree | d8456def48b09bd3914eb87c57ab53376f92c14f /src/quick/scenegraph/coreapi/qsgrenderer.cpp | |
| parent | c158ca8be49a75026e83751dfd825c5bdd63189a (diff) | |
| parent | 3f9367cb32533b691cb8c761213f21a524e3d1cb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4argumentsobject.cpp
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4errorobject.cpp
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/qml/jsruntime/qv4lookup.cpp
src/qml/jsruntime/qv4managed.cpp
src/qml/jsruntime/qv4managed_p.h
src/qml/jsruntime/qv4object.cpp
src/qml/jsruntime/qv4object_p.h
src/qml/jsruntime/qv4qmlcontext.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4vme_moth.cpp
src/qml/memory/qv4heap_p.h
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mm_p.h
src/qml/memory/qv4mmdefs_p.h
src/quick/scenegraph/util/qsgdistancefieldutil.cpp
src/quick/scenegraph/util/qsgdistancefieldutil_p.h
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I7ed925d4f5d308f872a58ddf51fdce0c8494ec9c
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgrenderer.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp index bb2671f6c3..8fbd402a2f 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp @@ -99,7 +99,7 @@ void QSGBindableFboId::bind() const #endif /*! \class QSGRenderer - \brief The renderer class is the abstract baseclass use for rendering the + \brief The renderer class is the abstract baseclass used for rendering the QML scene graph. The renderer is not tied to any particular surface. It expects a context to @@ -295,7 +295,7 @@ void QSGRenderer::preprocess() // We need to take a copy here, in case any of the preprocess calls deletes a node that // is in the preprocess list and thus, changes the m_nodes_to_preprocess behind our backs - // For the default case, when this does not happen, the cost is neglishible. + // For the default case, when this does not happen, the cost is negligible. QSet<QSGNode *> items = m_nodes_to_preprocess; for (QSet<QSGNode *>::const_iterator it = items.constBegin(); |