Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-04 | 2 | -1/+111 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-04 | 2 | -1/+111 |
| |\ | |||||
| | * | Fix TextInput auto test failure on mac. | Andrew den Exter | 2011-03-04 | 1 | -0/+1 |
| | * | Fix word selection locking on string boundaries. | Andrew den Exter | 2011-03-04 | 1 | -1/+72 |
| | * | QDeclarativePropertyMap::keys() cannot be called from qml | Charles Yin | 2011-03-03 | 1 | -0/+34 |
| | * | Compensate for horizontal scroll in TextInput micro focus. | Andrew den Exter | 2011-03-03 | 1 | -0/+4 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-03 | 8 | -7/+658 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-03 | 1 | -0/+18 |
| |\ \ | | |/ | |||||
| | * | Position the TextInput cursor correctly after IM text is commited. | Andrew den Exter | 2011-03-03 | 1 | -0/+18 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-02 | 5 | -7/+229 |
| |\ \ | | |/ | |||||
| | * | Make the TextInput cursorRectangle relative to the item. | Andrew den Exter | 2011-03-02 | 1 | -3/+39 |
| | * | Don't assert if font engine creates new glyphs | Aaron Kennedy | 2011-03-02 | 2 | -0/+24 |
| | * | Add QML file for TextEdit positionAt test. | Andrew den Exter | 2011-03-02 | 1 | -0/+9 |
| | * | Don't return positions within preedit text from positionAt(). | Andrew den Exter | 2011-03-01 | 2 | -7/+84 |
| | * | Add an is input method composing property to TextEdit and TextInput. | Andrew den Exter | 2011-03-01 | 2 | -0/+76 |
| * | | Changed some parts of QVolatileImage autotest to be Symbian specific. | Laszlo Agocs | 2011-03-01 | 1 | -0/+2 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-03-01 | 258 | -459/+17904 |
| |\ \ | |||||
| * | | | Changed QPixmap VG backend to use CFbsBitmap on Symbian. | Laszlo Agocs | 2011-02-28 | 3 | -0/+409 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-03-02 | 3 | -15/+53 |
|\ \ \ \ | |||||
| * | | | | Don't allow non-Object values to be set as prototype | Kent Hansen | 2011-03-02 | 1 | -4/+1 |
| * | | | | Don't assert in abortEvaluation() autotest | Kent Hansen | 2011-03-01 | 1 | -3/+48 |
| * | | | | Avoid asserting when computing line number for backtrace | Kent Hansen | 2011-03-01 | 1 | -4/+2 |
| * | | | | Make missing line number info an expected failure | Kent Hansen | 2011-02-28 | 1 | -8/+6 |
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-01 | 7 | -4/+170 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 7 | -4/+170 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-28 | 4 | -3/+90 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Fix FolderListModel test - set folder to one containing files. | Martin Jones | 2011-02-28 | 1 | -0/+3 |
| | | * | | | Drag over bounds errors when ListView has variable height content | Martin Jones | 2011-02-28 | 1 | -2/+24 |
| | | * | | | FolderListModel emitted incorrect rowsRemoved range causing crash. | Martin Jones | 2011-02-28 | 1 | -1/+30 |
| | | * | | | Fix test instability. | Martin Jones | 2011-02-28 | 1 | -0/+2 |
| | | * | | | Ensure layout is updated when section property changes. | Martin Jones | 2011-02-25 | 2 | -1/+24 |
| | | * | | | Add a 'CursorPosition' parameter to TextInput.positionAt(). | Andrew den Exter | 2011-02-24 | 1 | -0/+8 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-28 | 1 | -1/+11 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'graphics-team-text-4.7' into 4.7 | Eskil Abrahamsen Blomfeldt | 2011-02-28 | 1 | -1/+11 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix cursor position adjustment when removing strings | Jiang Jiang | 2011-01-25 | 1 | -0/+28 |
| | | | * | | | | Fix out of bounds handling in Mac shaper | Jiang Jiang | 2011-01-14 | 1 | -1/+11 |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-26 | 1 | -0/+11 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Don't crash when marking arguments object of native context | Kent Hansen | 2011-02-25 | 1 | -0/+11 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-25 | 1 | -0/+57 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | |||||
| | | * | | | | | QSortFilterProxyModel::reset() should invalidate. | Olivier Goffart | 2011-02-25 | 1 | -0/+57 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-01 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-02-28 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Resolve font alias before testing for exact matching | Jiang Jiang | 2011-02-28 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 2 | -3/+125 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix autotest on windows (again) | Harald Fernengel | 2011-02-28 | 1 | -1/+1 |
| * | | | | | | | fix autotest on windows | Harald Fernengel | 2011-02-27 | 1 | -0/+7 |
| * | | | | | | | fix test for QtLighthouse | Harald Fernengel | 2011-02-23 | 1 | -1/+1 |
| * | | | | | | | add test for suppressing warnings in moc | Harald Fernengel | 2011-02-23 | 1 | -2/+117 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-25 | 21 | -56/+1164 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-23 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | |