diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-21 18:38:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-21 18:38:53 (GMT) |
| commit | 8e65adce9ced8f3b1d42b938e4d65e1af4768c33 (patch) | |
| tree | 042094137a842b98a41474ce99192b67a822820c /doc/src/getting-started | |
| parent | 613be7cd75663ab8227de80d75d8f01e92c5c7d2 (diff) | |
| parent | 2ae6b44e4242c60bd882661e104bb53fa6670556 (diff) | |
| download | Qt-8e65adce9ced8f3b1d42b938e4d65e1af4768c33.zip Qt-8e65adce9ced8f3b1d42b938e4d65e1af4768c33.tar.gz Qt-8e65adce9ced8f3b1d42b938e4d65e1af4768c33.tar.bz2 | |
Merge branch '4.6'
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index bdc6558..9cda95a 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -648,10 +648,10 @@ These examples show the use of graphics widgets and layouts. \list - \o \l{graphicsview/anchorlayouts}{Anchor Layouts} + \o \l{graphicsview/anchorlayout}{Anchor Layout} \o \l{graphicsview/flowlayout}{Flow Layout} - \o \l{graphicsview/simpleanchorlayouts}{Simple Anchor Layouts} - \o \l{graphicsview/weatheranchorlayouts}{Weather Anchor Layouts} + \o \l{graphicsview/simpleanchorlayout}{Simple Anchor Layout} + \o \l{graphicsview/weatheranchorlayout}{Weather Anchor Layout} \endlist Some examples demonstrate the use of graphics effects with canvas items. |