diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 22:41:16 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-06 22:41:16 (GMT) |
commit | f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3 (patch) | |
tree | 01cdd02ff5c5c1b2c7dccaabf7addcb940feb7cd /tools/qml | |
parent | 3ec5f0c801645cf8beac52f7eab0c97190f9b46d (diff) | |
parent | 4409d1b454f02fa1e5e07560a1db6012074172eb (diff) | |
download | Qt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.zip Qt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.tar.gz Qt-f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
Diffstat (limited to 'tools/qml')
0 files changed, 0 insertions, 0 deletions