summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-261-1/+1
|\
| * Doc - added QHostInfo to QHostAddress' See Also line, as requested byKavindra Devi Palaraja2009-03-261-1/+1
| | | | | | | | | | | | | | the task. Task-number: 249423 Reviewed-by: TrustMe
* | Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | | | | | RevBy: TrustMe
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-251-10/+10
|\ \ | |/
| * Fix a small mistake in recalculating the timeout in case we getThiago Macieira2009-03-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interrupted twice by a signal. If we're interrupted only once, there's no problem. If we're interrupted twice, we subtract the elapsed time since the beginning from the remaining time, so this won't work. The correct thing is to recalculate from the original timeout value. This is extremely difficult to test, since it requires that the select(2) call be interrupted twice by signals. The only way to do this is by sending two signals to a program from another program (or threads, with pthread_kill(3)) with less than half of the time left, then send data to cause the loop to exit with success. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * Long live Qt 4.5!Lars Knoll2009-03-23128-0/+54195
|
* introduce QT_NO_NETWORKDISKCACHEPeter Hartmann2009-03-252-1/+8
| | | | | | | | | | that was necessary because when defining QT_NO_TEMPORARYFILE there would be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile. Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL license header. Reviewed-by: Paul Task-number: 248807
* Long live Qt!Lars Knoll2009-03-23128-0/+54227