summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-10-044-53/+22
|\
| * QNetworkRequest autotest: adapt to new cookie parsing (re. commas)Peter Hartmann2011-09-271-1/+1
| * Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-21900-10385/+20604
| |\
| * | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-163-52/+21
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...v4.8.0-rc1Qt Continuous Integration System2011-10-031-1/+1
|\ \ \
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-2734-295/+2503
| |\ \ \
| | * \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2734-295/+2503
| | |\ \ \
| * | \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-261-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix possible crash in QFontEngineFTEskil Abrahamsen Blomfeldt2011-09-261-1/+1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-0310-10/+23
|\ \ \ \ \ \
| * | | | | | Added text about -random and -seed options in QTest to changelogMagne Zachrisen2011-09-301-0/+5
| * | | | | | Add another part of the source code to the snippet.Casper van Donderen2011-09-302-0/+3
| * | | | | | Update changes-4.8.0Jens Georg2011-09-291-0/+1
| * | | | | | Update translation sources.Casper van Donderen2011-09-297-10/+10
| * | | | | | Update the changelog for qdoc in 4.8Casper van Donderen2011-09-291-0/+4
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-282-36/+93
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc updates to Qt for Symbian installation instructions and platform notes.Eero Hyyti2011-09-272-20/+43
| * | | | | | Doc updates to platform notes document.Eero Hyyti2011-09-271-2/+17
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingEero Hyyti2011-09-271-0/+9
| |\ \ \ \ \ \
| * | | | | | | Doc updates to platform notes of Qt 4.8 doc.Eero Hyyti2011-09-231-6/+12
| * | | | | | | Doc updates to Qt 4.8 platform notes documentation.Eero Hyyti2011-09-231-15/+28
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-09-271-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-09-23117-3490/+4498
| |\ \ \ \ \ \ \
| | * | | | | | | Disabled activeqt/webbrowser example from mingw build.Simo Fält2011-09-231-0/+3
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-278-14/+18
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-22149-3680/+4533
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Update changes-4.8.0 fileaavit2011-09-221-1/+1
| | * | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2264-3250/+3774
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Only limit cursor position when line is wrappedJiang Jiang2011-09-211-1/+1
| | * | | | | | | Make sure cursor position doesn't exceed line endJiang Jiang2011-09-191-0/+3
| | * | | | | | | Allow shared EGL contexts for xcb and xlib platformsReuben Dowle2011-09-192-2/+2
| | * | | | | | | Allow generic EGL platform contexts to be sharedReuben Dowle2011-09-192-3/+4
| | * | | | | | | 4.8 Changes: OpenGL Framebuffer FormatGerhard Roethlin2011-09-191-0/+2
| | * | | | | | | stop tslib plugin having same file name as linux input pluginReuben Dowle2011-09-191-1/+1
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-191-7/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | Avoid unnecessary detach of a QImage in QPixmapDropShadowFilterDavid Faure2011-09-191-7/+5
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-09-2626-246/+2417
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-2223-245/+2362
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Improve sbsv2 whatlog support.Miikka Heikkinen2011-09-223-2/+12
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-221-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix the incorrect sizeHint given by QLabel on SymbianJarkko T. Toivonen2011-09-151-0/+8
| | * | | | | | | | | | | Modified SymSQL documentation in sql-driver.qdoc according review commentsTimo Kauppinen2011-09-211-37/+92
| | * | | | | | | | | | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-213-54/+54
| | * | | | | | | | | | | Documentation modifications for SymbianSQL added into sql-driver.qdocTimo Kauppinen2011-09-211-1/+47
| | * | | | | | | | | | | Release Symbian SQL driverHonglei Zhang2011-09-211-175/+124
| | * | | | | | | | | | | Fixed a typo found by static checkerTimo Kauppinen2011-09-211-1/+1
| | * | | | | | | | | | | Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-215-0/+1467
| | * | | | | | | | | | | Symbian: Fix qmdiarea autotest regressionsMiikka Heikkinen2011-09-211-10/+10
| | * | | | | | | | | | | Merge branch 'SchemaMemLeak'Honglei Zhang2011-09-2110-213/+218
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix memory leaks in schema validationHonglei Zhang2011-09-2110-213/+218