diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-10 00:38:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-10 00:38:04 (GMT) |
| commit | 9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72 (patch) | |
| tree | 8b2a12fbf2cd035b7980cc91b1bce0c8a12f2127 /doc/src | |
| parent | 2b7de14b26de6f38b73b691c881f1c8f7be1a354 (diff) | |
| parent | a6b3fdccab1a4d3ed941ba069dc632aa9c8dc755 (diff) | |
| download | Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.zip Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.gz Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/qdeclarativemodels.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/examples/svgalib.qdoc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc index c0e028e..f7d1a73 100644 --- a/doc/src/declarative/qdeclarativemodels.qdoc +++ b/doc/src/declarative/qdeclarativemodels.qdoc @@ -208,7 +208,7 @@ QStringList provides the contents of the list via the \e modelData role: QStringList dataList; dataList.append("Fred"); dataList.append("Ginger"); -dataList.appenf("Skipper"); +dataList.append("Skipper"); QDeclarativeContext *ctxt = view.rootContext(); ctxt->setContextProperty("myModel", QVariant::fromValue(&dataList)); diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc index cf6512c..9142112 100644 --- a/doc/src/examples/svgalib.qdoc +++ b/doc/src/examples/svgalib.qdoc @@ -43,9 +43,6 @@ \example qws/svgalib \title Accelerated Graphics Driver Example - \warning This example was designed to work with Qt 4.4 and will not work - with current versions of Qt. It will be removed from Qt 4.7. - The Accelerated Graphics Driver example shows how you can write your own accelerated graphics driver and \l {add your graphics driver to Qt for Embedded Linux}. In \l{Qt for Embedded Linux}, |