Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-21 | 7 | -16/+140 |
|\ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-05-21 | 7 | -16/+140 |
| |\ | |||||
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-20 | 1 | -9/+81 |
| | |\ | |||||
| | | * | My 4.6.3 changes. | Trond Kjernåsen | 2010-05-20 | 1 | -16/+73 |
| | | * | Added my 4.6.3 changes. | Kim Motoyoshi Kalland | 2010-05-20 | 1 | -1/+4 |
| | | * | My 4.6.3 changes. | Samuel Rødal | 2010-05-20 | 1 | -0/+12 |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-20 | 1 | -2/+19 |
| | |\ \ | | | |/ | |||||
| | | * | Add my 4.6.3 changes | Kent Hansen | 2010-05-20 | 1 | -2/+19 |
| | |/ | |||||
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-20 | 3 | -9/+43 |
| | |\ | |||||
| | | * | Fix WebKit version dependency in pkg files | Simon Hausmann | 2010-05-20 | 1 | -1/+8 |
| | | * | Add support for including module specific .pri files as part of qt.prf handling | Simon Hausmann | 2010-05-20 | 1 | -0/+3 |
| | | * | My changelog entries for 4.6.3 | Denis Dzyubenko | 2010-05-20 | 1 | -2/+9 |
| | | * | Add my changes to the 4.6.3 changes log | Eskil Abrahamsen Blomfeldt | 2010-05-20 | 1 | -2/+14 |
| | | * | my changelog for 4.6.3 | Peter Hartmann | 2010-05-20 | 1 | -4/+9 |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-20 | 1 | -2/+0 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Switch Symbian^3 QCursor implementation back to 5.0 way | Shane Kearns | 2010-05-20 | 1 | -2/+0 |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-19 | 3 | -0/+3 |
| | |\ \ | |||||
| | | * | | fix qmake -project once more | Oswald Buddenhagen | 2010-05-18 | 3 | -0/+3 |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-20 | 11 | -1/+81 |
|\ \ \ \ \ | |||||
| * | | | | | Make dynamicscene example embeddeable in another graphics scene | Alan Alpert | 2010-05-20 | 1 | -1/+1 |
| * | | | | | Some minor example fixes | Alan Alpert | 2010-05-20 | 10 | -0/+80 |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-20 | 13 | -13/+64 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update docs with correct property name | Alan Alpert | 2010-05-20 | 1 | -1/+1 |
| * | | | | | Fix incorrect merge | Alan Alpert | 2010-05-20 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-20 | 210 | -3892/+4443 |
| |\ \ \ \ \ | |||||
| | * | | | | | Work around rendering bug in Rectangle. | Michael Brasser | 2010-05-20 | 1 | -1/+3 |
| | * | | | | | Remove warnings. | Warwick Allison | 2010-05-20 | 2 | -3/+0 |
| | * | | | | | Test e75088323ae15604139ddfd66b85cc3b8d43abeb | Warwick Allison | 2010-05-20 | 2 | -0/+6 |
| | * | | | | | Add XmlListModel::errorString() | Bea Lam | 2010-05-20 | 3 | -2/+37 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-19 | 5 | -9/+27 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix dynamicscene example | Alan Alpert | 2010-05-19 | 3 | -5/+16 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-19 | 590 | -58544/+17061 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update old keyword in docs | Alan Alpert | 2010-05-19 | 1 | -1/+1 |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-20 | 179 | -992/+3327 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Be consistent in conversion from string (eg. color, int rounding). | Warwick Allison | 2010-05-20 | 1 | -11/+14 |
| * | | | | | | | | Simplify code to make next change clearer. | Warwick Allison | 2010-05-20 | 1 | -14/+9 |
| * | | | | | | | | Stop warnings. | Warwick Allison | 2010-05-20 | 2 | -11/+11 |
| * | | | | | | | | Improve error messages when tests fail. | Warwick Allison | 2010-05-20 | 1 | -14/+15 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 6 | -8/+178 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Stop highlight animators for highlightFollowsCurrentItem: false | Martin Jones | 2010-05-20 | 6 | -8/+178 |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 21 | -93/+192 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Rename Component::errorsString() -> errorString() (and also for | Bea Lam | 2010-05-20 | 12 | -22/+24 |
| | * | | | | | | | | Fixes for docs, example code | Bea Lam | 2010-05-20 | 9 | -71/+168 |
| * | | | | | | | | | Ensure valuetype enums can be assigned from JS | Aaron Kennedy | 2010-05-20 | 2 | -0/+10 |
| * | | | | | | | | | Improve testcase | Aaron Kennedy | 2010-05-20 | 2 | -1/+11 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Make test more stable | Aaron Kennedy | 2010-05-20 | 1 | -2/+3 |
| * | | | | | | | | Autotest (XFAIL) for QTBUG-10822 | Aaron Kennedy | 2010-05-20 | 2 | -0/+22 |
| * | | | | | | | | Add return value for resolveTypeInNamespace | Aaron Kennedy | 2010-05-20 | 2 | -3/+3 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 3 | -0/+21 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ |