summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-203-16/+4
|\
| * Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| * Don't need to set FD_CLOEXEC since qt_safe_* will have done that.Thiago Macieira2010-12-151-13/+0
| * Abort working replies with error when network session fails.Aaron McCarthy2010-12-141-2/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-1015-243/+176
|\ \
| * | remove useless overloadKonstantin Ritt2010-12-101-2/+2
| * | simplify polling code a bitKonstantin Ritt2010-12-102-33/+8
| * | promote QNetworkConfigurationManager::updateConfigurations() to a slotKonstantin Ritt2010-12-101-1/+3
| * | simplify waitForOpened()Konstantin Ritt2010-12-101-9/+6
| * | fix CV-qualifiers for some membersKonstantin Ritt2010-12-102-13/+13
| * | minor clean-ups and styling fixesKonstantin Ritt2010-12-1015-186/+145
* | | QNetworkReply: set to finished for synchronous requestsPeter Hartmann2010-12-101-0/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0616-41/+206
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-271-1/+1
| |\
| | * Fix warning about use of uninitialised variableThiago Macieira2010-11-261-1/+1
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-261-2/+2
| |\ \ | | |/ | |/|
| | * Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-261-2/+2
| | |\
| | | * QLocalSocket/Win: do not emit error() when no error actually occurredJonathan Liu2010-11-261-2/+2
| * | | Revert "Fix a missing error-signal when a server is shut down while downloading"Peter Hartmann2010-11-262-18/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2515-41/+227
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-11-2416-41/+210
| | |\ \
| | | * | HTTP backend: fix build without Qt3 supportPeter Hartmann2010-11-231-1/+1
| | | * | QNetworkAccessManager: enable synchronous HTTP callsPeter Hartmann2010-11-2315-40/+209
| | * | | Fix a missing error-signal when a server is shut down while downloadingVille Pernu2010-11-242-1/+18
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-3/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-191-2/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-184-20/+47
| | |\ \ \ | | | |/ /
| | * | | SSL: Fix for systemCaCertificates being called first on symbianShane Kearns2010-11-111-2/+10
| * | | | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| | |/ / | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-194-20/+47
|\ \ \ \ | |/ / /
| * | | QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-132-3/+19
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-112-17/+28
| |\ \ \ | | |/ / | |/| |
| | * | Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-111-0/+1
| | * | SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-112-17/+27
* | | | Fix compilation after merge.Olivier Goffart2010-11-122-2/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1215-96/+80
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-112-16/+60
| |\ \ \ | | |/ / | |/| |
| | * | SSL: Fix crashes/hangs when retrieving CA certificatesShane Kearns2010-11-112-16/+60
| * | | QNAM: Do not need QNetworkSession in AlwaysCache load modeMarkus Goetz2010-11-082-12/+21
| * | | QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| * | | QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-061-0/+1
|\ \ \
| * | | Add missing Q_ENUMS to QAbstractSocketOlivier Goffart2010-11-051-0/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-061-5/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-051-5/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | QNAM HTTP: Do not set cache headers when already set by userRobert Hogan2010-11-011-4/+6
| | * | | QNAM: Do not cache network connections per username.Robert Hogan2010-11-011-1/+1
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-052-3/+7
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-051-2/+4
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-041-2/+4
| | |\ \ \