diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 01:59:31 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 01:59:31 +0200 |
| commit | eaa981c943293bf346a041aa4ad3d254e99ebd78 (patch) | |
| tree | 860d47d678f1ff9fb640b1046b8f67cf01df375a /src/tools | |
| parent | 7390cfbcbd5000a7da3eb5dbef790d114b06d042 (diff) | |
| parent | 3d85883b9e4957f44a870ffb8530acc16882ac01 (diff) | |
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:
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
QLocalServer: make many simultaneous connection attempts work on Windows
tst_QLocalSocket::threadedConnection autotest stabilized
tst_qlocalsocket: pro files of client / server examples fixed
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d8a9d09376a47b92ea49f1a078c392cbfdbc0ed6 )
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions