Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-03 | 15 | -8/+367 |
|\ | |||||
| * | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-22 | 4 | -1/+74 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-21 | 4 | -1/+74 |
| | |\ | |||||
| | | * | Fix TextInput cursor position unchanged when selection length is 0. | Andrew den Exter | 2011-04-21 | 2 | -0/+19 |
| | | * | Fix TextInput echoMode clearing inputMethodHints set by the user. | Andrew den Exter | 2011-04-21 | 1 | -1/+41 |
| | | * | Elide has unexpected effect on Text's implicitWidth | Martin Jones | 2011-04-21 | 2 | -0/+14 |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-21 | 2 | -3/+32 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-20 | 2 | -3/+32 |
| | |\ \ | | | |/ | |||||
| | | * | QDeclarativeDebug: Fix endless loop for property with SCRITABLE false | Kai Koehne | 2011-04-20 | 1 | -3/+18 |
| | | * | Fix excessive scrolling in TextInput with mid string pre-edit text. | Andrew den Exter | 2011-04-19 | 1 | -0/+14 |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 11 | -4/+261 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-15 | 4 | -3/+36 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 | Aaron Kennedy | 2011-04-15 | 1 | -1/+1 |
| | | * | Resolve unqualified attached properties correctly | Aaron Kennedy | 2011-04-15 | 3 | -2/+35 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-14 | 2 | -0/+107 |
| | |\ \ | | | |/ | |||||
| | | * | Moving contentY by large values in List/GridView is slow | Martin Jones | 2011-04-14 | 2 | -0/+107 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-13 | 2 | -1/+21 |
| | |\ \ | | | |/ | |||||
| | | * | Fix TextEdit cursorRectangle property. | Andrew den Exter | 2011-04-13 | 2 | -1/+21 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 4 | -0/+97 |
| | |\ \ | | | |/ | |||||
| | | * | Ensure view is positioned correctly when orientation changes. | Martin Jones | 2011-04-12 | 2 | -0/+54 |
| | | * | Fix regression in wigglytext.qml | Michael Brasser | 2011-04-12 | 2 | -0/+43 |
* | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-27 | 66 | -0/+0 |
|/ / / | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 21 | -737/+4 |
|\ \ \ | |||||
| * \ \ | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 4 | -3/+15 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 9 | -30/+266 |
| |\ \ \ \ | |||||
| * | | | | | QNetworkDiskCache: clean up after merge request | Peter Hartmann | 2011-04-01 | 1 | -0/+2 |
| * | | | | | QNetworkDiskCache: change file organization | Siddharth Mathur | 2011-04-01 | 1 | -2/+0 |
| * | | | | | Fix declarative after the last changes to the QObject internals | Olivier Goffart | 2011-03-31 | 1 | -4/+4 |
| * | | | | | Merge remote branch 'origin/master' into 4.8-earth | Denis Dzyubenko | 2011-03-28 | 3 | -8/+46 |
| |\ \ \ \ \ | |||||
| * | | | | | | Remove the qdeclarativewebview autotest. | Olivier Goffart | 2011-03-23 | 20 | -733/+0 |
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 6 | -27/+75 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 6 | -27/+75 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 5 | -27/+33 |
| | * | | | | ListModel::clear() should not clear roles | Bea Lam | 2011-04-12 | 1 | -0/+42 |
* | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-08 | 2 | -1/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-07 | 2 | -1/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Image w/ PreserveAspectFit has its width changed once more than needed. | Martin Jones | 2011-04-07 | 2 | -1/+13 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-06 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Improve Flickable dynamics and allow platform specific tweaking. | Martin Jones | 2011-04-06 | 1 | -1/+1 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-04 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix failing autotest | Bea Lam | 2011-04-04 | 1 | -1/+1 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-01 | 7 | -8/+237 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-01 | 7 | -8/+237 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Add missing test file. | Martin Jones | 2011-04-01 | 1 | -0/+50 |
| | * | | | Changing width of RTL positioner doesn't relayout | Martin Jones | 2011-04-01 | 1 | -0/+22 |
| | * | | | Fix TextInput auto test failure on mac. | Andrew den Exter | 2011-04-01 | 1 | -3/+10 |
| | * | | | PinchArea and Flickable don't work well enough together | Martin Jones | 2011-03-31 | 1 | -0/+73 |
| | * | | | Fix auto test failure. | Andrew den Exter | 2011-03-31 | 1 | -0/+8 |
| | * | | | Once Image sourceSize is set there is no way to clear it. | Martin Jones | 2011-03-31 | 1 | -0/+22 |