Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-07-01 | 3 | -4/+4 |
|\ | |||||
| * | Symbian socket engine: remove remaining todo comments | Shane Kearns | 2011-06-30 | 2 | -4/+3 |
| * | Push the data together with the error in the synchronous case. | Pierre Rossi | 2011-06-28 | 1 | -0/+1 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-06-27 | 3 | -0/+12 |
|\ \ | |/ | |||||
| * | Make it compile with openssl 1.0.0d, gcc 4.6 | Bernhard Rosenkraenzer | 2011-06-27 | 3 | -0/+12 |
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-24 | 3 | -13/+33 |
|\ \ | |/ |/| | |||||
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 3 | -13/+33 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 2 | -8/+31 |
| | |\ | |||||
| | * | | bearer: run the bearer engines in their own worker thread | Shane Kearns | 2011-06-13 | 3 | -16/+27 |
| | * | | Revert "Revert "Fix QNetworkConfigurationManager usage outside main thread fi... | Shane Kearns | 2011-06-13 | 1 | -3/+12 |
* | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-06-24 | 13 | -45/+67 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-22 | 2 | -9/+22 |
| |\ \ \ | |||||
| | * \ \ | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 2 | -9/+22 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-10 | 1 | -2/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | SSL readbuffer 16->32 kB | Jaakko Koskenkorva | 2011-06-10 | 1 | -2/+2 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-06-09 | 1 | -7/+20 |
| | | |\ \ | |||||
| | | | * | | Limit the cookies count per domain to 50. | Jocelyn Turcotte | 2011-06-09 | 1 | -7/+20 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-06-22 | 2 | -15/+23 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | symbian socket engine: resolve some fixme and todo items | Shane Kearns | 2011-06-22 | 2 | -15/+23 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-21 | 3 | -5/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Compile fix in network for ios | Ian | 2011-06-20 | 3 | -5/+7 |
| * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 16 | -6613/+67 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-06-01 | 2 | -14/+5 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-01 | 2 | -14/+5 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Increase SSL readbuffer 1 -> 16 kB | Jaakko Koskenkorva | 2011-05-31 | 1 | -2/+2 |
| | | | * | | | Revert "Fix QNetworkConfigurationManager usage outside main thread first" | Shane Kearns | 2011-05-31 | 1 | -12/+3 |
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 2 | -0/+4 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | / / | | | |_|/ / | | |/| | | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-26 | 2 | -0/+4 |
| | | |\ \ \ | | | | |/ / | | | | | / | | | | |/ | | | |/| | |||||
| | | | * | sockets: limit buffer size of the internal sockets in proxy engines | Shane Kearns | 2011-05-24 | 2 | -0/+4 |
| | | * | | fix the "Host" header for ipv6 URLs in QNAM | shiroki | 2011-05-25 | 1 | -1/+11 |
| | | |/ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 154 | -2622/+2622 |
| | | |\ | |||||
| | | | * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 154 | -2622/+2622 |
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 164 | -2912/+3212 |
| |\ \ \ \ | |||||
| * | | | | | Doc: Applying a pending change from previous merges. | David Boddie | 2011-05-11 | 1 | -0/+4 |
| * | | | | | Doc: Fixed qdoc warning. | David Boddie | 2011-05-11 | 1 | -1/+1 |
| * | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-11 | 2 | -3/+3 |
| * | | | | | setPeerVerifyMode() and peerVerifyMode() comments fix | Taito Silvola | 2011-05-05 | 1 | -2/+2 |
* | | | | | | QAuthenticator::setUser() parse user name in form user@domain | Martin Petersson | 2011-06-21 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-27 | 11 | -6598/+47 |
|\ \ \ \ \ | |||||
| * | | | | | symbian socket engine: share ip address conversion code | Shane Kearns | 2011-05-25 | 3 | -18/+12 |
| * | | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-24 | 164 | -2792/+2792 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore | Robert Hogan | 2011-05-24 | 5 | -6543/+2 |
| * | | | | | fix Symbian ordinals for merge request re. utf8 characters in SSL certs | Peter Hartmann | 2011-05-24 | 1 | -1/+5 |
| * | | | | | fix coding style for merge request re. utf8 characters in SSL certs | Pierre Rossi | 2011-05-23 | 1 | -7/+6 |
| * | | | | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName | Raul Metsma | 2011-05-23 | 3 | -36/+29 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-26 | 1 | -1/+11 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | fix "Host" header of ipv6 URLs in QNAM | shiroki | 2011-05-25 | 1 | -1/+11 |
* | | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-19 | 2 | -40/+80 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-18 | 5 | -11/+22 |
| |\ \ \ \ \ | |||||
| * | | | | | | Symbian socket: Implement systemProxyForQuery for service networks | Shane Kearns | 2011-05-18 | 1 | -37/+52 |