summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-4/+17
|\
| * QNAM HTTP: Fix no-headers and HTTP-100 handlingMarkus Goetz2010-03-163-4/+17
* | QNetworkReply: Fix canReadLine()Markus Goetz2010-03-162-1/+9
* | Abort waiting replies on session error.Aaron McCarthy2010-03-162-0/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-1512-207/+329
|\ \
| * | SSL: Fix memleak related to local certificateMarkus Goetz2010-03-154-3/+21
| * | Only enable BM by default in QNAM for appropriate platforms.Aaron McCarthy2010-03-122-8/+22
| * | Fix creation of QNetworkSession.Aaron McCarthy2010-03-111-2/+2
| * | Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.Aaron McCarthy2010-03-116-195/+285
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-4/+2
|\ \ \ | |/ / |/| / | |/
| * QSslKey: Do not make OpenSSL prompt for a password on stdinMarkus Goetz2010-03-151-3/+1
| * QHostInfo: Compile fixMarkus Goetz2010-03-081-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-079-27/+234
|\ \
| * \ Merge remote branch 'staging/4.7' into bearermanagement/pollingAaron McCarthy2010-03-051-1/+1
| |\ \
| * | | Don't keep polling network sessions open indefinitely.Aaron McCarthy2010-03-054-2/+36
| * | | Prefer ethernet over wlan.Aaron McCarthy2010-03-041-18/+51
| * | | Updating polling mechanism for bearer management engines.Aaron McCarthy2010-03-045-7/+147
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-064-14/+211
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Document some stuff in QHostInfo and QAbstractSocketMarkus Goetz2010-03-042-0/+15
| * | DNS Cache: Also check inside the DNS threadsMarkus Goetz2010-03-041-6/+18
| * | QNAM HTTP: Fix invoking a method when being destructed right nowMarkus Goetz2010-03-021-1/+5
| * | QAbstractSocket: Use new faster DNS functionMarkus Goetz2010-03-021-2/+16
| * | Add DNS caching to QHostInfoMarkus Goetz2010-03-022-7/+154
| * | QHostInfo: Forgot to free some stuff on application exit.Markus Goetz2010-03-011-0/+5
* | | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
| |/ |/|
* | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-0211-13/+49
|\ \
| * \ Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2710-12/+48
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-265-7/+12
| | |\ \
| | | * | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-245-7/+12
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-265-5/+36
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * QNAM HTTP: Switch back to QueuedConnection for requeueRequest.Markus Goetz2010-02-241-2/+16
| | | * QNAM HTTP: Set some values after clear() in a QHttpNetworkReplyMarkus Goetz2010-02-241-0/+2
| | | * QNetworkAccessManager: Documentation enhancementsMarkus Goetz2010-02-241-1/+8
| | | * QAbstractSocket: Clarify documentationMarkus Goetz2010-02-221-2/+8
| | | * QNetworkRequest: Doc enhancementMarkus Goetz2010-02-221-0/+2
| * | | Fix compilation with Sun CC: const in POD parameters makes a differenceThiago Macieira2010-02-271-1/+1
| |/ /
* | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-023-1/+9
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2327-11/+3293
|\ \
| * | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| * | Add locking to bearer code.Aaron McCarthy2010-02-226-102/+136
| * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2216-110/+238
| |\ \
| * | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| * | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| * | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| * | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
| * | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
| * | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
| * | | Simplify.Aaron McCarthy2010-02-151-2/+1
| * | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
| * | | Use snippets.Aaron McCarthy2010-02-151-8/+1