diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-23 06:58:04 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-23 06:58:04 (GMT) |
| commit | af0781b4d7d3d912815bc88703e9636a04e901a2 (patch) | |
| tree | 04a656e00b4df468cdae5b465ab7c2faa380dde7 /doc | |
| parent | fa2a1a8c584494a0e75732444ad3d7561a39d6f7 (diff) | |
| parent | f9e40798aa82e6cc052979b8c4b22901070c8f04 (diff) | |
| download | Qt-af0781b4d7d3d912815bc88703e9636a04e901a2.zip Qt-af0781b4d7d3d912815bc88703e9636a04e901a2.tar.gz Qt-af0781b4d7d3d912815bc88703e9636a04e901a2.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 9b44273..e1c9473 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -90,11 +90,11 @@ Module. \o \l{QML Modules} \o \l{Extending types from QML} \o \l{Dynamic Object Management in QML} -\o \l{Qt Declarative UI Runtime} \endlist \section1 Using QML with C++ \list +\o \l{Qt Declarative UI Runtime} \o \l{Using QML in C++ Applications} \o \l{Integrating QML with existing Qt UI code} \o \l{Tutorial: Writing QML extensions with C++} |