diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 16:06:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 16:06:10 (GMT) |
| commit | 8df5b06396d8b68cc13c719466c32aa26dc903de (patch) | |
| tree | 6e4961f5154a64196435688d4895e5222046634b /src/gui/text/qtextdocument_p.cpp | |
| parent | e1b03bac22f87edbbe78eba366966259be6eb0ed (diff) | |
| parent | dc5c5104a3f31b03954b33e1c098e17bc4634f27 (diff) | |
| download | Qt-8df5b06396d8b68cc13c719466c32aa26dc903de.zip Qt-8df5b06396d8b68cc13c719466c32aa26dc903de.tar.gz Qt-8df5b06396d8b68cc13c719466c32aa26dc903de.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:
tst_qnetworkreply benchmark: Properly finish the thread
QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket
doc: This bug wasn't really a bug; it just required clarification.
Update my changelog for 4.6.1
My changes for 4.6.1
Remove erroneous warning in QFileInfo::absolutePath()
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )
Diffstat (limited to 'src/gui/text/qtextdocument_p.cpp')
0 files changed, 0 insertions, 0 deletions