diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 02:58:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 02:58:43 (GMT) |
| commit | 5408f89972b23a899edff4a4a5ae7454369ad054 (patch) | |
| tree | b10e3a9a0e9d005a31b20fe011a11eace86b4c7f /doc | |
| parent | c00e6b499e89e4b872e9148c5f8a37f9050d9c84 (diff) | |
| parent | 9c5cea7d447019dcc5bad19ea3c27a358cccb2ed (diff) | |
| download | Qt-5408f89972b23a899edff4a4a5ae7454369ad054.zip Qt-5408f89972b23a899edff4a4a5ae7454369ad054.tar.gz Qt-5408f89972b23a899edff4a4a5ae7454369ad054.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Rename QGraphics...Layout classes/QML items to Graphics...Layout
File shouldn't be in repository
Implement removeAt() for layout classes to clean up item removal. Also
Split graphicsLayouts example into qgraphicslinearlayout and
Rename example layoutItem -> layoutitem and improve docs
Rename QDeclarativeDebugTiming -> QDeclarativeDebugTrace
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/qml-examples.qdoc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 56ba1c7..035628e 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -110,18 +110,27 @@ */ /*! - \title Graphics Layouts - \example declarative/cppextensions/qgraphicslayouts/graphicsLayouts + \title LayoutItem + \example declarative/cppextensions/qgraphicslayouts/layoutitem - This example show how to integrate Qt \l{Graphics View Framework}{Graphics View} components - like QGraphicsLayoutItem, QGraphicsLinearLayout and QGraphicsGridLayout into QML. + This example show how to use the LayoutItem element to integrate QML items into an existing + \l{Graphics View Framework}{Graphics View}-based application. */ /*! - \title Layout Item - \example declarative/cppextensions/qgraphicslayouts/layoutItem + \title QGraphicsGridLayout + \example declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout - This example show how to integrate QML into an existing - \l{Graphics View Framework}{Graphics View}-based application. + This example shows how to use QGraphicsGridLayout to lay out QML items. This is + useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with + QML. +*/ +/*! + \title QGraphicsLinearLayout + \example declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout + + This example shows how to use QGraphicsLinearLayout to lay out QML items. This is + useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with + QML. */ /*! \page declarative-cppextensions-qgraphicslayouts.html @@ -131,8 +140,9 @@ layout components with QML: \list - \o \l{declarative/cppextensions/qgraphicslayouts/graphicsLayouts}{Graphics Layouts} - \o \l{declarative/cppextensions/qgraphicslayouts/layoutItem}{Layout Item} + \o \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem} + \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout}{QGraphicsGridLayout} + \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout}{QGraphicsLinearLayout} \endlist */ |