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/diagramscene.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/diagramscene.qdoc')
| -rw-r--r-- | doc/src/examples/diagramscene.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index 9f2a8f8b76..ac9ca2f294 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -55,28 +55,28 @@ In particular we show how to: \list - \o Create custom graphics items. - \o Handle mouse events and movement of items. - \o Implement a graphics scene that can manage our custom items. - \o Custom painting of items. - \o Create a movable and editable text item. + \li Create custom graphics items. + \li Handle mouse events and movement of items. + \li Implement a graphics scene that can manage our custom items. + \li Custom painting of items. + \li Create a movable and editable text item. \endlist The example consists of the following classes: \list - \o \c MainWindow creates the widgets and display + \li \c MainWindow creates the widgets and display them in a QMainWindow. It also manages the interaction between the widgets and the graphics scene, view and items. - \o \c DiagramItem inherits QGraphicsPolygonItem and + \li \c DiagramItem inherits QGraphicsPolygonItem and represents a flowchart shape. - \o \c TextDiagramItem inherits QGraphicsTextItem and + \li \c TextDiagramItem inherits QGraphicsTextItem and represents text items in the diagram. The class adds support for moving the item with the mouse, which is not supported by QGraphicsTextItem. - \o \c Arrow inherits QGraphicsLineItem and is an arrow + \li \c Arrow inherits QGraphicsLineItem and is an arrow that connect two DiagramItems. - \o \c DiagramScene inherits QGraphicsDiagramScene and + \li \c DiagramScene inherits QGraphicsDiagramScene and provides support for \c DiagramItem, \c Arrow and \c DiagramTextItem (In addition to the support already handled by QGraphicsScene). |