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-281-0/+6
|\
| * QIODevice - disallow setTextMode when not openShane Kearns2011-10-271-0/+6
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-271-1/+1
|\ \
| * | Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-10-271-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-10-273-1/+15
|\ \ \
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-10-2660-376/+10966
| |\ \ \
| | * \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-10-2657-375/+10951
| | |\ \ \
| | * | | | Fix possible crash in glyph cache when deleting and creating contextsEskil Abrahamsen Blomfeldt2011-10-253-1/+15
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-269-59/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-10-26206-1607/+5879
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-2110-59/+98
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-10-2110-59/+98
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-215-59/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix security issue on website due to bad JS.Casper van Donderen2011-10-215-59/+2
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-20204-1508/+5815
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-10-19201-1508/+5803
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | * | | | | | | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-194-0/+12
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-261-0/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Update changelog for Qt 4.8Mark Brand2011-10-261-0/+7
* | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-2634-108/+497
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-2534-108/+497
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc: Fix example codeSergio Ahumada2011-10-211-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504Sami Merila2011-10-211-1/+1
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-202-3/+35
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-202-3/+35
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-194-1/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Workaround to VideoCore III scissor bug.Jani Hautakangas2011-10-194-1/+16
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-10-191-6/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-193-9/+18
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fix to QGLWidget crashJani Hautakangas2011-10-183-9/+18
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-182-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Update def filesJani Hautakangas2011-10-182-8/+9
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Typo fixJani Hautakangas2011-10-141-1/+1
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-173-2/+47
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-10-173-2/+47
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-146-1/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2011-10-14104-601/+945
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-131-2/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-15/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Cannot flick to the end of a horizontal list view width LayoutMirroringMartin Jones2011-10-122-15/+10
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-1279-145/+304
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Backport more imports directory caching changes.Martin Jones2011-10-114-15/+20
| | | * | | | | | | | | | | | Fix more test DEPLOYMENT statements for SymbianDamian Jansen2011-10-0510-16/+16
| | | * | | | | | | | | | | | Fix deployment for declarative tests, examples on SymbianDamian Jansen2011-10-0461-66/+66
| | | * | | | | | | | | | | | Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2Martin Jones2011-09-142-1/+21