summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-158-85/+343
|\
| * Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-102-3/+9
| |\
| | * Add exception barrier to QCertificateRetriever::RunL()Shane Kearns2010-07-082-3/+9
| * | Fix qdoc warning.Jason McDonald2010-07-091-1/+1
| |/
| * Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| * Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
| * Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| * QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| * Consolidate zlib configuration redundancyMark Brand2010-07-021-8/+1
| * Fixed whitespace formattingMark Brand2010-07-021-55/+57
| * QSslSocket::systemCaCertificates(): have one common case for all UnicesPeter Hartmann2010-07-011-7/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-0114-2047/+309
|\ \ | |/
| * SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-283-12/+50
| |\
| | * Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-271-0/+14
| |\ \ | | |/ | |/|
| | * Merge branch '4.6-s60' into 4.7-s60axis2010-06-241-0/+14
| | |\
| | | * Ensure that compiling with the no debug/warning output defines worksAndy Shaw2010-06-231-1/+1
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-211-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
| * | | | Corrected filename case for wincrypt.hMark Brand2010-06-261-1/+1
| * | | | Fix warnings in QSslSocketPrivate::systemCaCertificates()Zeno Albisser2010-06-251-8/+8
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-201-2/+17
| |\ \ \ | | |/ /
| | * | QLocalSocket/Win: handle ERROR_MORE_DATA after read operationJoerg Bornemann2010-06-171-2/+17
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-168-2017/+153
| |\ \
| | * | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-151-3/+8
| | * | QSslSocket: fix build for MinGW and VS 2005Peter Hartmann2010-06-141-0/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-128-2016/+143
| | |\ \
| | | * | remove certificate bundlePeter Hartmann2010-06-113-1992/+0
| | | * | make QSslSocket::systemCaCertificates() use system certsPeter Hartmann2010-06-113-20/+138
| | | * | Adjusted RegExp in QSslCertificate::fromPath()Zeno Albisser2010-06-111-1/+1
| | | * | Updated leading whitespace to make indentation more consistentConstantin Makshin2010-06-101-1/+1
| | | * | Updated project files so it is now possible to use "-system-zlib" configurati...Constantin Makshin2010-06-101-2/+3
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-151-0/+13
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-141-0/+11
| | * | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-141-0/+2
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-134-11/+23
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-101-0/+3
| | * | QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamedJoerg Bornemann2010-06-102-6/+8
| | * | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-101-4/+6
| | * | QLocalServer: make many simultaneous connection attempts work on WindowsJoerg Bornemann2010-06-102-1/+6
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-104-6/+34
| |\ \ \ | | | |/ | | |/|
| * | | Doc: Added details of a system proxy limitation on Windows.David Boddie2010-06-071-5/+27
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-084-6/+34
|\ \ \ \ | | |/ / | |/| |
| * | | Don't poll non-polling engines when configurations are in use.Aaron McCarthy2010-06-031-2/+4
| * | | QNAM: Improve child deletion orderMarkus Goetz2010-06-021-0/+9
| * | | QSslCertificate: support large serial numbersPeter Hartmann2010-06-021-4/+19
| * | | QNetworkCookie: do not accept cookies with non-alNum domainPeter Hartmann2010-05-311-0/+2
| |/ /