diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 03:59:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 03:59:09 (GMT) |
| commit | 38010df8513e04b5d71d69ae57077323c59440e5 (patch) | |
| tree | 5b2a8e5e8608fe60c1fea754e9149466179dd8bb /doc/src/examples/mandelbrot.qdoc | |
| parent | 7120119af835c139b8808e7dcdeec3eb11b0b36d (diff) | |
| parent | d0e1e7c1249348eeba128c71681cfa916c9e5ae1 (diff) | |
| download | Qt-38010df8513e04b5d71d69ae57077323c59440e5.zip Qt-38010df8513e04b5d71d69ae57077323c59440e5.tar.gz Qt-38010df8513e04b5d71d69ae57077323c59440e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits)
Fix build when snap functionality is not available.
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
...
Diffstat (limited to 'doc/src/examples/mandelbrot.qdoc')
| -rw-r--r-- | doc/src/examples/mandelbrot.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc index 7a3c1cd..11173a8 100644 --- a/doc/src/examples/mandelbrot.qdoc +++ b/doc/src/examples/mandelbrot.qdoc @@ -285,7 +285,7 @@ \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 8 If the pixmap has the right scale factor, we draw the pixmap directly onto - the widget. Otherwise, we scale and translate the \l{The Coordinate + the widget. Otherwise, we scale and translate the \l{Coordinate System}{coordinate system} before we draw the pixmap. By reverse mapping the widget's rectangle using the scaled painter matrix, we also make sure that only the exposed areas of the pixmap are drawn. The calls to |