diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-08 11:00:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-08 11:48:54 +0200 |
| commit | 8a5837467d153c50c869625390a584b0335b77b7 (patch) | |
| tree | d8aca950cb88dfdc3a001a5cdedf02d7a8894d36 /src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc | |
| parent | 5af4c9b237a23ce12ca7c56eb6c9ecda17743228 (diff) | |
| parent | 55490690f81eba168b06a90e4a66cefc20b38252 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Conflicts:
src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenode.cpp
Change-Id: Id8107cb0de0fbfe7120a90a137b49c2b915ff2d3
Diffstat (limited to 'src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc')
| -rw-r--r-- | src/quick/doc/src/concepts/visualcanvas/adaptations.qdoc | 2 |
1 files changed, 1 insertions, 1 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 |