diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
| commit | 7f2540ad80f56ccb4d81b897d90581130e9b9e91 (patch) | |
| tree | 1e1ff4c8f9846faddd58a8ff6d0810bdac7c6f20 /doc/src/getting-started | |
| parent | f33359fb0c56fe88e0ae3c564b7847f90889eac2 (diff) | |
| parent | 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9 (diff) | |
| download | Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.zip Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.gz Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/getting-started/gettingstarted.qdoc | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index b2895ba..1bf86e5 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -529,7 +529,7 @@ \title OpenVG Examples \brief Accessing OpenVG from Qt - \image openvg-examples.png + \image opengl-examples.png Qt provides support for integration with OpenVG implementations on platforms with suitable drivers. diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc index 145982b..e58305a 100644 --- a/doc/src/getting-started/gettingstarted.qdoc +++ b/doc/src/getting-started/gettingstarted.qdoc @@ -30,7 +30,13 @@ \group gettingStarted - Following is a list. + \section1 + Creating applications using Qt and QML is easy enough once you get started. + To get you started we have created two tutorials creating two similar applications, + but using diiferent approaches. One tutorial implements the user interface using + QML, while the other implements the whole application using traditional Qt. + + Please click on the links below to start the ride. \generatelist{related} */ |