summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-0412-29/+11
|\
| * QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is def...shkim2011-09-291-2/+0
| * retreving -> retrievingAlbert Astals Cid2011-09-281-3/+3
| * Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-28107-3499/+5986
| |\
| * | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-274-16/+0
| * | Removed duplicate link from QFinalState documentation.jaanttil2011-09-271-1/+1
| * | Clarified keypad navigation specific event documentation.jaanttil2011-09-271-2/+2
| * | docs: Typo and link fixes.jaanttil2011-09-273-4/+4
| * | Use the right callback in QObject::disconnect()Olivier Goffart2011-09-271-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-10-0414-88/+158
|\ \ \
| * | | QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjsKai Koehne2011-09-291-3/+7
| * | | Fix assertAaron Kennedy2011-09-281-1/+1
| * | | Compile fix for SymbianAaron Kennedy2011-09-211-4/+4
| * | | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-09-20727-9463/+21781
| |\ \ \
| | * | | Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-163-6/+6
| | * | | Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-167-58/+58
| | * | | Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| * | | | Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-151-9/+16
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-10-041-13/+5
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.8' into earth-staging-masterSinan Tanilkan2011-09-21707-8960/+16426
| |\ \ \ \ \
| * | | | | | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2011-09-161-13/+5
* | | | | | | 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 remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2724-280/+2342
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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-038-10/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add another part of the source code to the snippet.Casper van Donderen2011-09-301-0/+1
| * | | | | | | Update translation sources.Casper van Donderen2011-09-297-10/+10
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-277-13/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-2242-3128/+3241
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | 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
| * | | | | | | 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-2620-233/+2290
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| * | | | | | | | | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-213-54/+54
| * | | | | | | | | 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
| * | | | | | | | | Merge branch 'SchemaMemLeak'Honglei Zhang2011-09-219-212/+214
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix memory leaks in schema validationHonglei Zhang2011-09-219-212/+214
| * | | | | | | | | | Symbian: Added copy-paste functionality to FEP input contextMiikka Heikkinen2011-09-212-20/+597
| * | | | | | | | | | symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-2095-598/+913
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \