summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-21 02:45:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-21 02:45:24 (GMT)
commit5cc33b7cb372686bdf535f4489b2e5deeb1a56d5 (patch)
treeed23f73871a3070baf947d4e2e4210e188ed6e3d /doc/doc.pri
parent6aa50af000f85cc4497749fcf0860c8ed244a60e (diff)
parent503207e8e66b8cb749b7facd5b60010aa6c47567 (diff)
downloadQt-5cc33b7cb372686bdf535f4489b2e5deeb1a56d5.zip
Qt-5cc33b7cb372686bdf535f4489b2e5deeb1a56d5.tar.gz
Qt-5cc33b7cb372686bdf535f4489b2e5deeb1a56d5.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: 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/doc.pri')
0 files changed, 0 insertions, 0 deletions