diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 00:56:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 00:56:36 (GMT) |
| commit | ff9eebaa9adb9cd41e97ac806238888546e77294 (patch) | |
| tree | c2d0c03d7b45222f7586f67a52939af0033c8ab8 /src/declarative/util/qdeclarativepixmapcache.cpp | |
| parent | e41274fede7f35324e37438bd8c08fd78e0ca29f (diff) | |
| parent | 332c194a66ef37179c3267c2f4acd1f6b6feb7f3 (diff) | |
| download | Qt-ff9eebaa9adb9cd41e97ac806238888546e77294.zip Qt-ff9eebaa9adb9cd41e97ac806238888546e77294.tar.gz Qt-ff9eebaa9adb9cd41e97ac806238888546e77294.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: More work on the QML documentation.
Doc: Worked on two more elements, replacing an image.
Doc: qdoc fixes.
Doc: Added types to method and signal documentation; other fixes.
Doc: Fixed autotest breakage caused by snippets.
Doc: More work on QML documentation and snippets.
Doc: Fixed links and markup.
Doc: More work on the QML documentation.
Doc: Minor improvements and fixes.
Doc: Fixed incorrect use of commands to mark documentation.
Doc: Started to improve QML reference documentation.
Doc: Moved the inline code into snippet files.
Doc: Started to reorganize the QML documentation structure.
Doc: Used snippets for the Beginning QML document. License update.
Doc: Updated QML snippets.
Doc: Updated licenses to the three clause BSD license.
Doc: Made more improvements to the QML documentation.
Doc: Started work to tidy up existing QML docs.
Diffstat (limited to 'src/declarative/util/qdeclarativepixmapcache.cpp')
0 files changed, 0 insertions, 0 deletions