diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 03:15:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 03:15:12 (GMT) |
| commit | cde72ad73cf2ee31e701e84763c152685493b7c7 (patch) | |
| tree | 564b1e8b38491495b43437300989d2857b65b8c3 /doc/doc.pri | |
| parent | 34a81201b04a065b948d4da3b2a08b65c45232db (diff) | |
| parent | f966c3f22cd453a47ef6754c24b050bc5c2ac5f0 (diff) | |
| download | Qt-cde72ad73cf2ee31e701e84763c152685493b7c7.zip Qt-cde72ad73cf2ee31e701e84763c152685493b7c7.tar.gz Qt-cde72ad73cf2ee31e701e84763c152685493b7c7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
qdoc: Added QML Elements to the Assistant index
qdoc: Fixed virtualness and constness of the fileBase() function.
Added the location of Getting Started with QML code.
Diffstat (limited to 'doc/doc.pri')
0 files changed, 0 insertions, 0 deletions