summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1143-224/+1421
|\
| * 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
| | | |\ \ | | |_|/ / | |/| | |
| | | * | 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