diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2017-05-03 11:30:27 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2017-05-03 11:02:39 +0000 |
commit | 4f3bb75d2271717d932eb63a1193494d44eafb4f (patch) | |
tree | a49a17a6ad5a3e6e43ccad92793ab4373322626a /src | |
parent | 98fb1a65adb8ddf5fa1516bed067a13eed36091c (diff) |
Doc: fix 'adpatation' -> 'adaptation'
Change-Id: Ia852d86d9b9585a1d3d9b07eb8b48361d61c5671
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc b/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc index 76f863d07f..bcfdf311af 100644 --- a/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc @@ -73,7 +73,7 @@ adaptations. The default adaptation capable of providing the full Qt Quick 2 feature set is the OpenGL adaptation. All of the details of the OpenGL -adpatation can are available here: +adaptation can are available here: \l{qtquick-visualcanvas-scenegraph-renderer.html}{OpenGL Adaptation} \section1 Software Adaptation diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc index 2e41c85873..cb14c72b04 100644 --- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc @@ -32,7 +32,7 @@ \section1 The Scene Graph in Qt Quick Qt Quick 2 makes use of a dedicated scene graph based and a series of -adpatations of which the default uses OpenGL ES 2.0 or OpenGL 2.0 for +adaptations of which the default uses OpenGL ES 2.0 or OpenGL 2.0 for its rendering. Using a scene graph for graphics rather than the traditional imperative painting systems (QPainter and similar), means the scene to be rendered can be retained between diff --git a/src/quick/doc/src/concepts/visualcanvas/topic.qdoc b/src/quick/doc/src/concepts/visualcanvas/topic.qdoc index 168c616d06..f6b4024f7a 100644 --- a/src/quick/doc/src/concepts/visualcanvas/topic.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/topic.qdoc @@ -57,7 +57,7 @@ See the documentation about the \l{qtquick-visualcanvas-visualparent.html} Modern computer systems and devices use graphics processing units or GPUs to render graphics. Qt Quick can leverage this graphics hardware by using graphics -APIs like OpenGL. The default graphics adpatation for Qt Quick requires OpenGL and +APIs like OpenGL. The default graphics adaptation for Qt Quick requires OpenGL and it is used to display applications developed with Qt Quick in QML. In particular, Qt Quick defines a scene graph which is then rendered. See the documentation about the \l{qtquick-visualcanvas-scenegraph.html}{Scene Graph} for in-depth information about diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 8e78586697..90bdfd41e2 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3853,7 +3853,7 @@ QSGTexture *QQuickWindow::createTextureFromImage(const QImage &image, CreateText initialized or OpenGL is not in use. \note This function only has an effect when using the default OpenGL scene graph - adpation. + adaptation. \sa sceneGraphInitialized(), QSGTexture */ @@ -3961,7 +3961,7 @@ void QQuickWindow::setDefaultAlphaBuffer(bool useAlpha) graph renderer. Clear these manually on demand. \note This function only has an effect when using the default OpenGL scene graph - adpation. + adaptation. \sa QQuickWindow::beforeRendering() */ |