summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-05-161-1/+1
* Retain ABI and API compatibility when Qt is built with EGL.Michał Zając2011-05-132-1/+15
* update def filesShane Kearns2011-05-106-51/+526
* Merge remote branch 'qt/4.8' into staging-masterShane Kearns2011-05-107-31/+93
|\
| * 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-094-27/+85
| |\ \ | | |/
| | * Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-093-10/+41
| | * Allow using not only prefixes for undo command textAlexander Potashev2011-05-093-17/+44
| * | 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-061-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH...Pino Toscano2011-05-051-1/+1
* | | | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-1017-60/+305
|\ \ \ \ | |_|_|/ |/| | |
| * | | Sockets: Fix potential null pointer usagesShane Kearns2011-05-052-8/+13
| * | | Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-053-1/+16
| * | | Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-054-1/+19
| * | | Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-04-211-0/+6
| * | | 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
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8Bradley T. Hughes2011-05-0623-226/+292
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-066-99/+144
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-0575-353/+959
| | |\ \ \ | | | | |/ | | | |/|
| | * | | QSslConfiguration documentation fixTaito Silvola2011-05-051-2/+2
| | * | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-052-18/+33
| | * | | 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-052-2/+3
| |\ \ \ \
| | * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-042-2/+3
| | |\ \ \ \
| | | * | | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-05-041-1/+7
| | | * | | | Don't rely on uninitialized dataJoão Abecasis2011-05-031-0/+1
| | | * | | | Don't realloc user-provided bufferJoão Abecasis2011-05-031-2/+2
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-0515-125/+145
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Compile on WindowsEskil Abrahamsen Blomfeldt2011-05-041-1/+1
| | * | | | | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-036-12/+60
| | * | | | | Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-032-101/+0
| | * | | | | Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2011-05-031-2/+7
| | * | | | | Only cleanup share widget if it has been created.Armin Berres2011-05-021-3/+9
| | * | | | | Add required font metrics functions to QRawFontJiang Jiang2011-05-022-0/+56
| | * | | | | Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2011-05-021-1/+4
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-05-024-6/+9
| | |\ \ \ \ \
| | | * | | | | Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-022-5/+5
| | | * | | | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-293-1/+11