summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-09-10 11:37:49 (GMT)
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-09-10 11:41:43 (GMT)
commitabfa26ff5be47edcf38a48bacb4bd310badca09e (patch)
tree4546019dd48808543ead10092fc294272770e491 /doc
parent93340b47b14605fb54a6d74f07af8d3c4d6a1777 (diff)
downloadQt-abfa26ff5be47edcf38a48bacb4bd310badca09e.zip
Qt-abfa26ff5be47edcf38a48bacb4bd310badca09e.tar.gz
Qt-abfa26ff5be47edcf38a48bacb4bd310badca09e.tar.bz2
Fixed references to QFxPainted, which got replaced by QFxPaintedItem
See commit 415708f85341448c6f30bbca6e31e48dbfde72a5, and later renaming of QFxImageItem to QFxPaintedItem in commit d1bb572b9fb5b0286df992c8ae560d91c9dc3388. Also added a table of contents to the QML for C++ Programmers page.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/cppitem.qdoc6
-rw-r--r--doc/src/declarative/qmlforcpp.qdoc2
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/declarative/cppitem.qdoc b/doc/src/declarative/cppitem.qdoc
index 4543156..38da0fb 100644
--- a/doc/src/declarative/cppitem.qdoc
+++ b/doc/src/declarative/cppitem.qdoc
@@ -94,7 +94,7 @@ You can create a new type of QML item by:
To add a new type, you first must add a new C++ class derived from QFxItem.
You may of course extend existing QFxItem subclasses.
-One existing subclass is QFxPainted, which provides
+One existing subclass is QFxPaintedItem, which provides
a simple cached-image painting model.
\section2 Reimplementing paint functions
@@ -105,11 +105,11 @@ Two alternative painters are available, offering
different levels of performance and functionality:
QPainter, GLPainter.
-You can choose to subclass QFxPainted rather than QFxItem,
+You can choose to subclass QFxPaintedItem rather than QFxItem,
and then implement the virtual method:
\code
- void paint(QPainter *painter);
+ void drawContents(QPainter *painter, const QRect &rect);
\endcode
This paints into an offscreen pixmap which is then painted to the display (transformed,
diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc
index 5838df7..ab456e5 100644
--- a/doc/src/declarative/qmlforcpp.qdoc
+++ b/doc/src/declarative/qmlforcpp.qdoc
@@ -15,6 +15,8 @@
either for the first time at startup or subsequently thereafter - the
property is automatically updated with the new value.
+ \tableofcontents
+
\section1 Loading and using QML Files
QmlComponent is used to load a QML file and to create object instances.