summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | Backport imports directory caching performance optimizationMartin Jones2011-09-126-56/+190
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-111-0/+29
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | | | * | Add new signals to indicate GPU resource usage.Jani Hautakangas2011-10-145-0/+66
| | | | * | symbian - search drives for translation filesShane Kearns2011-10-131-2/+38
| | | |/ / | | |/| |
| | * | | Symbian - fix deleteLater not working from RunLShane Kearns2011-10-111-0/+29
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-251-1/+9
|\ \ \ \ \
| * | | | | Update changelog for Qt 4.8miniak2011-10-241-1/+9
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-242-1/+10248
|\ \ \ \ \ \
| * | | | | | Added Lithuanian translation of Qt.Rimas Kudelis2011-10-241-0/+10247
| * | | | | | Remove idc from mingw build.Markku Heikkila2011-10-241-1/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-241-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Update changelog for Qt 4.8Sinan Tanilkan2011-10-241-0/+3
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-10-2212-60/+232
|\ \ \ \ \ \ \
| * | | | | | | Add the ability to enable various SSL bug workarounds.Richard Moore2011-10-219-9/+206
| * | | | | | | Fix performance regression on Mac OS X when creating/destroying QMutexBradley T. Hughes2011-10-213-51/+26
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-10-211-6/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'qt-fire-review/master'aavit2011-10-21495-1892/+6395
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-10-20496-1892/+6400
| | |\ \ \ \ \ \ \
| * | | | | | | | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-10-2010-59/+98
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |