diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-13 12:04:29 (GMT) |
| commit | 7d805a6717692b540c02b8caace25a0b47c7f0d6 (patch) | |
| tree | 3368927682df73ac437e8f321ba28e51d1463cd0 /doc/src/index.qdoc | |
| parent | c6ed32dc7e9c8a566f376d1baa7e616a1019f9af (diff) | |
| parent | 58d0e46dcc50a3cddabc177c9dfdfec5c66e932d (diff) | |
| download | Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.zip Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.gz Qt-7d805a6717692b540c02b8caace25a0b47c7f0d6.tar.bz2 | |
Merge branch '4.7' of ../oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 0609eb8..2272cf8 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -66,15 +66,15 @@ <div class="sectionlist tricol"> <ul> <li><a href="qt-basic-concepts.html">Basic Concepts</a></li> - <li><a href="qt-gui-concepts.html">UI Components</a></li> - <li><a href="developing-with-qt.html">Cross-platform & Platform-specific</a></li> - <li><a href="technology-apis.html">Qt API's for standard technologies </a></li> - <li><a href="best-practices.html">Qt How-to's & best practices</a></li> + <li><a href="qt-gui-concepts.html">GUI Components</a></li> + <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li> + <li><a href="technology-apis.html">Qt APIs for standard technologies </a></li> + <li><a href="best-practices.html">How-To Guides and Best Practices</a></li> </ul> </div> <div class="sectionlist"> <ul> - <li><a href="declarativeui.html">Qt Quick</a></li> + <li><a href="qtquick.html">Qt Quick</a></li> <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li> <li><a href="qdeclarativeelements.html">QML Elements</a></li> <li><a href="model-view-programming.html">Model/View Programming</a></li> @@ -109,6 +109,4 @@ </div> </div> \endraw - - */ |