diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
| commit | 195fbdfb7f9a8ade3347a651090722a7d3ecccfb (patch) | |
| tree | afd29e9eda1c4f898b1e6e78f23140e87454cdb5 /doc/src/getting-started | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | 67fbf125f3f96ea0ff0da66b1dd8b7dd348ca69f (diff) | |
| download | Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.zip Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.gz Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.bz2 | |
Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 67000e2..296e032 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -488,10 +488,12 @@ \image ipc-examples.png \list - \o \l{ipc/localfortuneclient}{Local Fortune Client}\raisedaster - \o \l{ipc/localfortuneserver}{Local Fortune Server}\raisedaster + \o \l{ipc/localfortuneclient}{Local Fortune Client} + \o \l{ipc/localfortuneserver}{Local Fortune Server} \o \l{ipc/sharedmemory}{Shared Memory}\raisedaster \endlist + + Examples marked with an asterisk (*) are fully documented. */ /*! |