diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /doc/src/qtquick2/canvaspainting.qdoc | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'doc/src/qtquick2/canvaspainting.qdoc')
| -rw-r--r-- | doc/src/qtquick2/canvaspainting.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/qtquick2/canvaspainting.qdoc b/doc/src/qtquick2/canvaspainting.qdoc index 8590c74913..3b1f742b8f 100644 --- a/doc/src/qtquick2/canvaspainting.qdoc +++ b/doc/src/qtquick2/canvaspainting.qdoc @@ -34,8 +34,8 @@ \section1 Canvas Element \list - \o \l{Canvas} - \o \l{Context2D} + \li \l{Canvas} + \li \l{Context2D} \endlist The Canvas and Context2D elements implement the \l{HTML Canvas API 2D Context} |