Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix test. Missed files. | Warwick Allison | 2010-05-20 | 3 | -0/+21 |
| * | | | | | | Fix test | Aaron Kennedy | 2010-05-20 | 1 | -1/+0 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Missing break | Aaron Kennedy | 2010-05-20 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Create overview page for examples for Extending QML in C++ | Bea Lam | 2010-05-20 | 3 | -4/+27 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 148 | -860/+2840 |
| |\ \ \ \ |/ / / / / | | | | _ | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 148 | -860/+2840 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Search for QML import libraries also in application directory | Kai Koehne | 2010-05-19 | 2 | -8/+16 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-19 | 146 | -852/+2824 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-05-19 | 27 | -211/+698 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-19 | 5 | -163/+242 |
| | | | |\ \ | |||||
| | | | | * | | Rename qml executable to qmlviewer | Kai Koehne | 2010-05-19 | 3 | -6/+8 |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-19 | 9 | -162/+439 |
| | | | | |\ \ | |||||
| | | | | | * | | Introduce a threaded interpreter for QML binding bytecode | Aaron Kennedy | 2010-05-19 | 1 | -156/+233 |
| | | | | * | | | Don't crash if the target parent is destroyed. | Martin Jones | 2010-05-19 | 1 | -1/+1 |
| | | | * | | | | Disable mouse-based selection in TextInput/TextEdit | Warwick Allison | 2010-05-19 | 7 | -10/+137 |
| | | | | |/ / | | | | |/| | | |||||
| | | | * | | | Bug moved. | Warwick Allison | 2010-05-19 | 1 | -1/+1 |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-19 | 79 | -127/+349 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | When changing Loader source, remove old item from scene immediately. | Martin Jones | 2010-05-19 | 1 | -2/+6 |