summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
|\ \ \ | | |/ | |/|
| * | 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
* | | Doc: Added details of a system proxy limitation on Windows.David Boddie2010-06-071-5/+27
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-251-0/+26
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-241-0/+26
| |\ \
| | * | fix typo in documentationAlex2010-05-241-1/+1
| | * | Improve Bearer Management related documentation in QNetworkAccessManagerAlex2010-05-241-0/+26
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-252-9/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
| * | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
* | | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| |/ |/|
* | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-198-24/+20
|\ \
| * \ Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-2/+0
| |\ \ | | |/
| | * QNAM HTTP: Remove dead codeMarkus Goetz2010-05-181-2/+0
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-177-22/+20
| |\ \ | | |/
| | * QNetworkAccessManager: Backends were tried in wrong orderMarkus Goetz2010-05-141-1/+1
| | * QNAM HTTP: Preemptive anti crash if() statementMarkus Goetz2010-05-131-0/+3
| | * QNAM HTTP: Only force read when actual bytes availableMarkus Goetz2010-05-121-1/+2
| | * QHostInfo: Remove unused includesRitt Konstantin2010-05-053-5/+1
| | * QNAM HTTP: Start more requests in once function callMarkus Goetz2010-05-051-15/+13
* | | doc: Fixed many broken links.Martin Smith2010-05-192-4/+4
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1217-18/+185
|\ \
| * | Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"Morten Johan Sørvig2010-05-101-1/+1