diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /doc/src/examples/transformations.qdoc | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'doc/src/examples/transformations.qdoc')
| -rw-r--r-- | doc/src/examples/transformations.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index 9a23c6c8e6..8bca26eb77 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -42,9 +42,9 @@ The example consists of two classes and a global enum: \list - \o The \c RenderArea class controls the rendering of a given shape. - \o The \c Window class is the application's main window. - \o The \c Operation enum describes the various transformation + \li The \c RenderArea class controls the rendering of a given shape. + \li The \c Window class is the application's main window. + \li The \c Operation enum describes the various transformation operations available in the application. \endlist |