summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | Add autotests for configuration dependent network proxiesShane Kearns2011-04-182-1/+145
| | | | * | | | | | Fix QNetworkReplyImpl error handlingShane Kearns2011-04-181-4/+13
| | | | * | | | | | Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-04-182-27/+53
| | | | * | | | | | Allow a network configuration to be included in a proxy queryShane Kearns2011-04-183-4/+123
| | | | * | | | | | Optimisation - buffer packet read in pendingDatagramSizeShane Kearns2011-04-132-9/+56
| | | | * | | | | | Fix error handling in write for socks socket engineShane Kearns2011-04-121-1/+6
| | | | * | | | | | Remove warnings when disabling notifications on a closed socketShane Kearns2011-04-121-6/+1
| | | | * | | | | | Fix some warnings in symbian network testsShane Kearns2011-04-124-1/+9
| | | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8Bradley T. Hughes2011-05-0634-265/+413
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | | * | | | | | | Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-051-5/+8
| | |/ / / / / / /
* | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-092-9/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-092-9/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Ukrainian translation updatedVictor Ostashevsky2011-05-092-9/+5
* | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-063-5/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-063-5/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | fix random miscompilation with msvcOswald Buddenhagen2011-05-061-0/+1
| | * | | | | | don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
| | * | | | | | make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-061-4/+6
| | * | | | | | make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-061-1/+1
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-0629-28/+199
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-051-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-051-4/+4
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-0511-18/+129
| |\ \ \ \ \
| | * | | | | Skip test on MacOS due to problems with corewlan pluginShane Kearns2011-05-051-1/+5
| | * | | | | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-055-2/+28
| | * | | | | Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| | * | | | | Fix compile errors in bearer testsShane Kearns2011-05-043-12/+12
| | * | | | | Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-043-4/+80
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-0510-0/+23
| |\ \ \ \ \ \
| | * | | | | | Views do not notify count changes properlyMartin Jones2011-05-0510-0/+23
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-052-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-0410-40/+146
| |\ \ \ \ \ \ \
| | * | | | | | | Fix ordinal number conflictJiang Jiang2011-05-041-1/+1
| | * | | | | | | QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-05-032-19/+93
| | * | | | | | | memory leak fixTero Toivola2011-05-031-0/+4
| | * | | | | | | Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-023-0/+46
| | * | | | | | | Fix merge conflictJiang Jiang2011-04-2910-2/+86
| | |\ \ \ \ \ \ \
| | * | | | | | | | Revert symbol addition in b033bb9Jiang Jiang2011-04-294-20/+2
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-069-105/+173
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-05138-823/+2748
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | QSslConfiguration documentation fixTaito Silvola2011-05-051-2/+2
| * | | | | | | | | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-053-18/+56
| * | | | | | | | | | HTTP auto tests: do not load resources from cache that must be revalidtdPeter Hartmann2011-05-042-6/+6
| * | | | | | | | | | HTTP cache backend: do not load resources that must be revalidatedPeter Hartmann2011-05-041-2/+7
| * | | | | | | | | | HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-041-7/+5
| * | | | | | | | | | Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-041-1/+1
| * | | | | | | | | | Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-041-0/+1
| * | | | | | | | | | Added support for QLocale::uiLanguages on Symbian.Denis Dzyubenko2011-05-041-70/+96
* | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-054-2/+36
|\ \ \ \ \ \ \ \ \ \ \