diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 19:51:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 19:51:16 (GMT) |
| commit | 8f6bd97ac405f8ed31d4c6a8dd0edd8c9f1580ce (patch) | |
| tree | dcb8f00cddac104c792961f0e79366a14cb1e2ab /doc/src/index.qdoc | |
| parent | fe239b32550e83e8a42617457adca8d7922ff92f (diff) | |
| parent | f30d3602011780e598e6b55c69d0b40a9cc94e16 (diff) | |
| download | Qt-8f6bd97ac405f8ed31d4c6a8dd0edd8c9f1580ce.zip Qt-8f6bd97ac405f8ed31d4c6a8dd0edd8c9f1580ce.tar.gz Qt-8f6bd97ac405f8ed31d4c6a8dd0edd8c9f1580ce.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits)
Fix test.
Remove hacky fix (breaks autotest).
Fix Behaviors for object-type properties.
Pass symbols::prefix (Action -> QmlAction)
Add license header.
Fix bad merge (compile)
Pass tst_headers::licenseCheck
Fix ListView tests.
Test fixes.
More test fixes.
Clean up QmlImageReader thread on engine destruction.
Update test to handle QmlNetworkAccessManagerFactory
Test fixes.
Add a QEXPECT_FAIL for known bug.
Fix autotest.
Add some painting benchmarks.
Make sure cookies are saved.
Fix headers::licenseCheck autotest failure
Re-add accidentally deleted file
Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
...
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 0a603ce..d1f5f0f 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -103,6 +103,7 @@ <li><a href="paintsystem.html">Painting and Printing</a></li> <li><a href="graphicsview.html">Canvas UI with Graphics View</a></li> <li><a href="webintegration.html">Integrating Web Content</a></li> + <li><a href="declarativeui.html">Declarative UI (QML)</a></li> </ul> </td> <td valign="top"> |