summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14116-8614/+8510
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-09-102-8/+34
| |\
| | * QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+34
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-301-10/+12
| |\ \ | | |/
| | * QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-08-301-11/+12
| | * QSslCertificate: blacklist fraudulent *.google.comPeter Hartmann2011-08-301-0/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-191-1/+6
| |\ \ | | |/ | |/|
| | * Doc: Fixed qdoc warnings.David Boddie2011-08-151-1/+6
| * | HTTP internals: send password even if no username is setRobert Hogan2011-08-151-2/+2
| * | HTTP backend: invoke methods directly for synchronous requestsPeter Hartmann2011-08-101-2/+2
| |/
| * Merge remote-tracking branch 'earth-team/master'Olivier Goffart2011-07-201-2/+3
| |\
| | * QNetworkAccessFileBackend: Add warning for file url without scheme.Martin Petersson2011-07-191-2/+3
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-091-0/+1
| |\ \
| | * | Fix resource leak in symbian socket engineShane Kearns2011-07-081-0/+1
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-081-0/+1
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-0/+1
| | |\ \ \
| * | \ \ \ Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-084-6/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-064-6/+16
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-07-013-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-013-4/+4
| | |\ \ \ \
| | | * | | | Symbian socket engine: remove remaining todo commentsShane Kearns2011-06-302-4/+3
| | | * | | | Push the data together with the error in the synchronous case.Pierre Rossi2011-06-281-0/+1
| * | | | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-302-0/+9
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-273-0/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Make it compile with openssl 1.0.0d, gcc 4.6Bernhard Rosenkraenzer2011-06-273-0/+12
| | | |_|/ | | |/| |
| * | | | 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 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 '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 remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-0/+4
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | 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