diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 00:56:53 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 00:56:53 (GMT) |
commit | d1f77a5e47d79b9fb688046a7357bc0c8b21c875 (patch) | |
tree | 30b4f2a479f3583963a65682def0c33b9484ebf3 /src/xml/stream | |
parent | e575816cd618841e90e8933ff52e40a8581d3328 (diff) | |
parent | 2dd3a061ea0a0f1361c3f12d6859a4b9cdcae7bb (diff) | |
download | Qt-d1f77a5e47d79b9fb688046a7357bc0c8b21c875.zip Qt-d1f77a5e47d79b9fb688046a7357bc0c8b21c875.tar.gz Qt-d1f77a5e47d79b9fb688046a7357bc0c8b21c875.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket: Take better care on how we use the SSL buffers
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 )
Revert "Make an empty QUrl also be considered non-detached (d == 0)."
SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF
doc: Documented the return value for QDomNode::appendChild().
QNAM HTTP: make it give some better error messages in case of socket failure.
qUncompress: Fix terminating \0
Add qttracereplay.exe to gitignore
Fix missing focus rect for check and radio buttons in some GTK+ themes
Diffstat (limited to 'src/xml/stream')
0 files changed, 0 insertions, 0 deletions