summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-243-13/+33
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-13/+33
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-8/+31
| | |\
| | * | bearer: run the bearer engines in their own worker threadShane Kearns2011-06-133-16/+27
| | * | Revert "Revert "Fix QNetworkConfigurationManager usage outside main thread fi...Shane Kearns2011-06-131-3/+12
* | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-2413-45/+67
|\ \ \ \ | |/ / /
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-222-9/+22
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-222-9/+22
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-101-2/+2
| | | |\ \ | | | | |/
| | | | * SSL readbuffer 16->32 kBJaakko Koskenkorva2011-06-101-2/+2
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-06-091-7/+20
| | | |\ \
| | | | * | Limit the cookies count per domain to 50.Jocelyn Turcotte2011-06-091-7/+20
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-222-15/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | symbian socket engine: resolve some fixme and todo itemsShane Kearns2011-06-222-15/+23
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-213-5/+7
| |\ \ \ \ \
| | * | | | | Compile fix in network for iosIan2011-06-203-5/+7
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1716-6613/+67
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-012-14/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-012-14/+5
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Increase SSL readbuffer 1 -> 16 kBJaakko Koskenkorva2011-05-311-2/+2
| | | | * | | Revert "Fix QNetworkConfigurationManager usage outside main thread first"Shane Kearns2011-05-311-12/+3
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-0/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | / / | | | |_|/ / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-262-0/+4
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/|
| | | | * sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-05-242-0/+4
| | | * | fix the "Host" header for ipv6 URLs in QNAMshiroki2011-05-251-1/+11
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17154-2622/+2622
| | | |\
| | | | * Update licenseheader text in source filesJyri Tahtela2011-05-13154-2622/+2622
| * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24164-2912/+3212
| |\ \ \ \
| * | | | | Doc: Applying a pending change from previous merges.David Boddie2011-05-111-0/+4
| * | | | | Doc: Fixed qdoc warning.David Boddie2011-05-111-1/+1
| * | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-3/+3
| * | | | | setPeerVerifyMode() and peerVerifyMode() comments fixTaito Silvola2011-05-051-2/+2
* | | | | | QAuthenticator::setUser() parse user name in form user@domainMartin Petersson2011-06-211-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-2711-6598/+47
|\ \ \ \ \
| * | | | | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| * | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-24164-2792/+2792
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-245-6543/+2
| * | | | | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| * | | | | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| * | | | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-261-1/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-251-1/+11
* | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-192-40/+80
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-185-11/+22
| |\ \ \ \ \
| * | | | | | Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-181-37/+52
| * | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-1116-60/+299
| |\ \ \ \ \ \
| * | | | | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-061-3/+28
* | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-185-11/+22
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-174-10/+21
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix thread safety regression of QNetworkConfigurationManagerShane Kearns2011-05-132-2/+2