diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 09:16:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 09:16:58 (GMT) |
commit | b000d828d20793b2aad0e9d1449adaf1331c0b01 (patch) | |
tree | 3df4cd34721a7db0e5f8b0c45c17b52f41e5d6fc /doc/src/snippets/sqldatabase/sqldatabase.pro | |
parent | 2fdac06f820f2362d3ca83ab6d73ed874d903098 (diff) | |
parent | 76f64bfa979e291a8350fd87ceda4307d5a48d71 (diff) | |
download | Qt-b000d828d20793b2aad0e9d1449adaf1331c0b01.zip Qt-b000d828d20793b2aad0e9d1449adaf1331c0b01.tar.gz Qt-b000d828d20793b2aad0e9d1449adaf1331c0b01.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:
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
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77
Fix for emitting changed signal in QClipboard
Fixed tst_QNetworkDiskCache creating badly named directories.
Specialize peek() for QBuffer
Documentation changes to QTextLayout.
Doc: Updated example license to three clause BSD license.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions