summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-16 16:50:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-16 16:50:34 (GMT)
commit30c8d1e3dccc83499ac3d76284cfb2e8d860808a (patch)
tree1d64aba69045221953034f0194dd4045e819d529 /doc
parent65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (diff)
parent8e59d3372d9ba18b48ae0b2271fa453332a1ac12 (diff)
downloadQt-30c8d1e3dccc83499ac3d76284cfb2e8d860808a.zip
Qt-30c8d1e3dccc83499ac3d76284cfb2e8d860808a.tar.gz
Qt-30c8d1e3dccc83499ac3d76284cfb2e8d860808a.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7932e8da6bfdeff653c572c22aed879c8c308829 ) Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52 VideoWidget example Buildfix for MSVC2008 (C90 violation) Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 1313dc84678c74f1c24f910f702d7ed27a417607 Add skeleton changes files for 4.6.4. Bump version number after 4.6.3 release. Fixed unit test failure in qimagereader. beautify tst_QLocalSocket::writeToClientAndDisconnect QLocalSocket/Win: check for broken pipe in waitForReadyRead QLocalSocket/Win: call close on async connection loss Fix issues with thai line breaking fix detection of header files Prospective S60 build fix Thread safety for QFontEngineS60 Allow to build Qt in static with mingw Fix incorrect line breaking in QtWebKit. QLocalSocket: don't emit readChannelFinished() twice on Windows QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed QLocalSocket: fix reading from a socket after broken connection ...
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions