diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 23:21:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 23:21:52 (GMT) |
| commit | 8b059a78b2632e31492fa25cfaae99b111a041a6 (patch) | |
| tree | e30c11849ffc99ceee0c52a3951aa732db715ec0 /doc/src/snippets/snippets.pro | |
| parent | 7f3d9a76e9d956d9e7e4398ac20785070e214958 (diff) | |
| parent | c3eeb227360343ccb34365e384e085b358d81f21 (diff) | |
| download | Qt-8b059a78b2632e31492fa25cfaae99b111a041a6.zip Qt-8b059a78b2632e31492fa25cfaae99b111a041a6.tar.gz Qt-8b059a78b2632e31492fa25cfaae99b111a041a6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits)
Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Doc: Relicensed the documentation under the GNU FDL version 1.3.
doc: Added more DITA output to the XML generator
Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
Fix for a leak in the mac style.
Doc: Fixing bugs to style and script
doc: Added more DITA output to the XML generator
Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
Fix compiler warnings in QtGui (text,painting).
Allow Unix to generate unique UUIDs if /dev/urandom exists.
Allow GNU Free Documentation license header.
Add missing license header.
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Fix example compile and runtime warnings, webkit examples not built.
qgl_cl_p.h is no longer existent
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Doc: Fixed documentation errors.
doc: Added more DITA output to the XML generator
doc: Fixed type of Package::name
...
Diffstat (limited to 'doc/src/snippets/snippets.pro')
| -rw-r--r-- | doc/src/snippets/snippets.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/snippets.pro b/doc/src/snippets/snippets.pro index e3e7eca..a999c17 100644 --- a/doc/src/snippets/snippets.pro +++ b/doc/src/snippets/snippets.pro @@ -28,7 +28,7 @@ SUBDIRS = brush \ # modelview-subclasses \ # broken painterpath \ persistentindexes \ - picture \ +# picture \ # broken plaintextlayout \ # pointer \ polygon \ |