summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-212-2/+3
|\
| * Fix one hang of QNAM on Symbian.Jocelyn Turcotte2010-09-201-2/+2
| * Fix compile warnings.Friedemann Kleint2010-09-141-0/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-7/+1
|\ \ | |/
| * Merge commit 'refs/merge-requests/2464' of git://gitorious.org/qt/qt into int...David Boddie2010-09-081-6/+0
| |\
| | * Correct QNetworkReply::downloadProgress and uploadProgress docsJohn Brooks2010-09-011-6/+0
| * | QNetworkAccessManager doc: add since tag for added enumPeter Hartmann2010-08-311-1/+1
| |/
* | QNAM HTTP: Fix a warningMarkus Goetz2010-08-241-1/+3
* | QNAM: Move a qRegisterMetaTypeMarkus Goetz2010-08-242-2/+2
* | QNAM: New QNetworkReply::setFinished() protected functionMarkus Goetz2010-08-248-21/+25
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-1313-97/+377
|\ \
| * | QNAM HTTP: Remove eatWhitespace() hackMarkus Goetz2010-08-132-30/+8
| * | QNAM: Fix namespaced compilationMarkus Goetz2010-08-121-1/+3
| * | QNAM Zerocopy: QNAM implementation partMarkus Goetz2010-08-126-1/+138
| * | QNAM Zerocopy: HTTP implementation partMarkus Goetz2010-08-127-67/+230
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-133-21/+23
|\ \ \ | |/ / |/| / | |/
| * QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| * Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-091-9/+9
| |\
| | * doc: Fixed some qdoc errors.Martin Smith2010-08-061-28/+15
| * | Doc: Fixed qdoc warnings.David Boddie2010-08-051-11/+9
| |/
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-3/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-284-11/+16
|\ \ | |/
| * QNAM HTTP: Fix problem with cached files and metaDataChanged()Markus Goetz2010-07-151-4/+4
| * Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeaderThiago Macieira2010-07-151-7/+2
| * QNAM: Add future enum attribute for Zerocopy QNAMMarkus Goetz2010-07-122-0/+10
* | QNAM: Stop half-supporting wrong way of deletingMarkus Goetz2010-07-272-31/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-152-64/+59
|\ \ | |/
| * Fix qdoc warning.Jason McDonald2010-07-091-1/+1
| * Consolidate zlib configuration redundancyMark Brand2010-07-021-8/+1
| * Fixed whitespace formattingMark Brand2010-07-021-55/+57
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-3/+4
|\ \ | |/
| * 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-082-0/+11
|\ \ | |/
| * QNAM: Improve child deletion orderMarkus Goetz2010-06-021-0/+9
| * QNetworkCookie: do not accept cookies with non-alNum domainPeter Hartmann2010-05-311-0/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-012-1/+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-251-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-251-3/+5
|\ \ \ \ | |/ / /
| * | | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| | |/ | |/|
* | | Revert "Revert "Use QUrl::isLocalFile and fix the scheme checking in local UR...Thiago Macieira2010-05-202-9/+13
* | | Revert "Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively""Thiago Macieira2010-05-201-1/+1
|/ /
* | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-195-19/+19
|\ \
| * \ 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