summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
|\
| * Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
* | 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
|\ \ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-10-103-137/+133
|\ \ \ \ \
| * | | | | Doc updates to installation, platform notes and symbian introduction.Eero Hyyti2011-10-103-137/+133
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-061-2/+19
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-054-1/+66
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-031-0/+2
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-281-1/+1
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-287-42/+227
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-272-291/+374
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Document updates to Qt for Symbian installation instructions and platform notes.Eero Hyyti2011-09-272-291/+374
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-271-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update Korean Translationsshkim2011-09-271-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Incorrect 'break' in switch-case was replaced by 'return'Viktor Kolesnyk2011-09-221-1/+1
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-223-1/+235
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-213-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-09-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |