summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3127-43/+295
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-18/+1
| |\
| | * HTTP: fix digest authenticationPeter Hartmann2011-01-241-18/+1
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1727-25/+294
| |\ \ | | |/
| | * various fixes to deal with CI gate failuresJeremy Katz2011-01-141-15/+15
| | * QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-122-0/+269
| | * Update copyright year to 2011.Jason McDonald2011-01-1025-25/+25
| | * Change QHostInfoCache to use QElapsedTime instead of QTime.Niklas Kurkisuo2011-01-102-3/+3
* | | Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-281-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed include in network module on Symbian.axis2011-01-281-1/+1
* | | QHostInfoCache: Use QElapsedTime instead of QTimeNiklas Kurkisuo2011-01-062-3/+3
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-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
| |\
| | * trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | * Fix crashHarald Fernengel2010-11-021-2/+4
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-3/+7
|\ \ \ | |/ /
| * | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-031-3/+7
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-292-6/+9
|\ \ | |/
| * QAuthenticator: Fix NTLMv2 credential caching of QNAMMarkus Goetz2010-10-272-6/+9
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-1/+4
|\ \ | |/
| * Insert the result of QHostInfo::fromName into the hostinfo cache, too.David Faure2010-09-281-1/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-8/+11
|\ \ | |/
| * QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-212-9/+31
|\ \ | |/
| * NTLM code: Save domain in different variableMarkus Goetz2010-09-102-9/+31
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-104-34/+54
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-073-15/+17
| |\
| | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-033-15/+17
| * | Update to the NTLM code.Thiago Macieira2010-08-311-19/+37
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-1/+4
|\ \ \ | |/ /
| * | Keep the scopeid that getaddrinfo(3) returns to us.Thiago Macieira2010-08-241-1/+4
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+1
|\ \ \ | |/ /
| * | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
* | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-5/+0
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-284-25/+399
|\ \ \ | |/ /
| * | Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| * | Autotest: add a small, boring test for QAuthenticatorThiago Macieira2010-07-151-1/+1
| * | Add documentation for the QAuthenticator options.Thiago Macieira2010-07-151-2/+40
| * | Expose the QAuthenticator map of options in the API.Thiago Macieira2010-07-153-3/+50
| * | Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeaderThiago Macieira2010-07-152-13/+27
| * | Fixing merge conflicts.Martin Smith2010-07-131-5/+7
| |\ \
| * | | Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-091-7/+279
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-152-10/+39
|\ \ \ \ | | |/ / | |/| |
| * | | Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
| |/ /
| * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-012-5/+41
|\ \ \ | |/ /
| * | Merge branch '4.6-s60' into 4.7-s60axis2010-06-241-0/+14
| |\ \ | | |/
| | * Fix QTBUG-8687.Aleksandar Sasha Babic2010-06-181-3/+8
| | * Debug prints and another attempt to fix QTBUG-8687 for N8.Aleksandar Sasha Babic2010-06-181-0/+9
| * | Doc: Added details of a system proxy limitation on Windows.David Boddie2010-06-071-5/+27