summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-28137-3638/+6887
|\
| * 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
| | | * | | | | | | | | Symbian: Added copy-paste functionality to FEP input contextMiikka Heikkinen2011-09-212-20/+597
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-202-1/+52
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-20119-705/+1498
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-20118-705/+1495
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-262-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-242-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-232-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix accessible menu not returning child name.Frederik Gladhorn2011-09-232-1/+7
| | * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-222-45/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-2059-3240/+3609
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-191-3/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-231-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Update changelog for Qt-4.8.0: add QtWebKit notesAdemar de Souza Reis Jr2011-09-231-0/+5
| | * | | | | | | | | | | | | | | | Update changelog for Qt 4.8Sinan Tanilkan2011-09-231-0/+4
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-221-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-222-45/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)Andreas Kling2011-09-221-1/+1