summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-042-1/+111
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-042-1/+111
| |\
| | * Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | * Fix word selection locking on string boundaries.Andrew den Exter2011-03-041-1/+72
| | * QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-031-0/+34
| | * Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-031-0/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-038-7/+658
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-031-0/+18
| |\ \ | | |/
| | * Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-0/+18
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-025-7/+229
| |\ \ | | |/
| | * Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-3/+39
| | * Don't assert if font engine creates new glyphsAaron Kennedy2011-03-022-0/+24
| | * Add QML file for TextEdit positionAt test.Andrew den Exter2011-03-021-0/+9
| | * Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-012-7/+84
| | * Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-012-0/+76
| * | Changed some parts of QVolatileImage autotest to be Symbian specific.Laszlo Agocs2011-03-011-0/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-01260-459/+18012
| |\ \
| * | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-283-0/+409
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-021-1/+3
|\ \ \ \
| * | | | Add qscriptobject and context2d to "trusted" benchmarksKent Hansen2011-03-021-1/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-023-15/+53
|\ \ \ \ \ | |/ / / /
| * | | | Don't allow non-Object values to be set as prototypeKent Hansen2011-03-021-4/+1
| * | | | Don't assert in abortEvaluation() autotestKent Hansen2011-03-011-3/+48
| * | | | Avoid asserting when computing line number for backtraceKent Hansen2011-03-011-4/+2
| * | | | Make missing line number info an expected failureKent Hansen2011-02-281-8/+6
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-017-4/+170
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-017-4/+170
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-284-3/+90
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix FolderListModel test - set folder to one containing files.Martin Jones2011-02-281-0/+3
| | | * | | Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-281-2/+24
| | | * | | FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-281-1/+30
| | | * | | Fix test instability.Martin Jones2011-02-281-0/+2
| | | * | | Ensure layout is updated when section property changes.Martin Jones2011-02-252-1/+24
| | | * | | Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-241-0/+8
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-281-1/+11
| | |\ \ \ \
| | | * \ \ \ Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-281-1/+11
| | | |\ \ \ \
| | | | * | | | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-0/+28
| | | | * | | | Fix out of bounds handling in Mac shaperJiang Jiang2011-01-141-1/+11
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-261-0/+11
| | |\ \ \ \ \ \
| | | * | | | | | Don't crash when marking arguments object of native contextKent Hansen2011-02-251-0/+11
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-251-0/+57
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / /
| | | * | | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-251-0/+57
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-011-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-281-0/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Resolve font alias before testing for exact matchingJiang Jiang2011-02-281-0/+7
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-282-3/+125
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix autotest on windows (again)Harald Fernengel2011-02-281-1/+1
| * | | | | | | fix autotest on windowsHarald Fernengel2011-02-271-0/+7
| * | | | | | | fix test for QtLighthouseHarald Fernengel2011-02-231-1/+1
| * | | | | | | add test for suppressing warnings in mocHarald Fernengel2011-02-231-2/+117
| |/ / / / / /