summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-05-118-51/+41
|\
| * fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76eJoerg Bornemann2011-05-111-2/+2
| * qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| * qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| * qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-054-14/+27
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-1031-117/+1111
|\ \
| * | update def filesShane Kearns2011-05-106-51/+526
| * | Merge remote branch 'qt/4.8' into staging-masterShane Kearns2011-05-1013-103/+330
| |\ \ | |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-092-3/+7
|\ \ \
| * | | ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-091-3/+2
| * | | fix build on symbianOswald Buddenhagen2011-05-091-0/+5
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-098-27/+266
|\ \ \ \ | |/ / /
| * | | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-094-10/+100
| * | | Allow using not only prefixes for undo command textAlexander Potashev2011-05-097-17/+166
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-061-5/+8
|\ \ \ \
* \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-063-73/+57
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH...Pino Toscano2011-05-051-1/+1
| * | | | Massively update the hurd-g++ mkspec.Pino Toscano2011-05-051-72/+56
| * | | | rebuild configureOswald Buddenhagen2011-05-051-0/+0
| | | * | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-1025-66/+585
| | | |\ \ | | |/ / /
| | | * | Sockets: Fix potential null pointer usagesShane Kearns2011-05-052-8/+13
| | | * | Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-053-1/+16
| | | * | fix tst_qnetworkreply::httpProxyCommands autotestShane Kearns2011-05-051-2/+7
| | | * | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-055-2/+28
| | | * | Fix spelling mistakeShane Kearns2011-05-041-1/+1
| | | * | Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-04-213-1/+116
| | | * | 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
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | 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
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-044-2/+36
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-042-1/+28
| | |\ \ \ \ \ \
| | | * | | | | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-05-042-1/+28
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-032-0/+33
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |