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/mandelbrot.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/mandelbrot.qdoc')
| -rw-r--r-- | doc/src/examples/mandelbrot.qdoc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc index 23e51ba637..a560766bdd 100644 --- a/doc/src/examples/mandelbrot.qdoc +++ b/doc/src/examples/mandelbrot.qdoc @@ -66,9 +66,9 @@ \table \row - \o \inlineimage mandelbrot_zoom1.png - \o \inlineimage mandelbrot_zoom2.png - \o \inlineimage mandelbrot_zoom3.png + \li \inlineimage mandelbrot_zoom1.png + \li \inlineimage mandelbrot_zoom2.png + \li \inlineimage mandelbrot_zoom3.png \endtable Similarly, when the user scrolls, the previous pixmap is scrolled @@ -77,17 +77,17 @@ \table \row - \o \inlineimage mandelbrot_scroll1.png - \o \inlineimage mandelbrot_scroll2.png - \o \inlineimage mandelbrot_scroll3.png + \li \inlineimage mandelbrot_scroll1.png + \li \inlineimage mandelbrot_scroll2.png + \li \inlineimage mandelbrot_scroll3.png \endtable The application consists of two classes: \list - \o \c RenderThread is a QThread subclass that renders + \li \c RenderThread is a QThread subclass that renders the Mandelbrot set. - \o \c MandelbrotWidget is a QWidget subclass that shows the + \li \c MandelbrotWidget is a QWidget subclass that shows the Mandelbrot set on screen and lets the user zoom and scroll. \endlist |