Commit message (Collapse) | 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-03-30 | 935 | -2250/+5724 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (136 commits) Make QDeclarativeListProperty a class Fix qdeclarativedom::loadDynamicProperty test Correctly parent repeater items. Make sure cursor delegate is parented. Allow just one dimension to be set, the other scaled accordingly Simplify import path. Removed unneeded code. Update autotest a little Improve QML compiler statistics Use error enum not numbers Pass test. doc test error code too QDeclarativeItem::setParentItem should not modify the QObject parent Doc Ensure currentIndex is updated when PathView items are removed/moved Visual test fixes. Doc Relayout items when Flow size changes. Make sure the image reader thread is shutdown properly ... | ||||
| * | Make QDeclarativeListProperty a class | Aaron Kennedy | 2010-03-30 | 2 | -2/+4 |
| | | | | | | | | Apparently structs are not socially acceptable. | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-30 | 10 | -77/+65 |
| |\ | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | ||||
| | * | Correctly parent repeater items. | Michael Brasser | 2010-03-30 | 1 | -5/+5 |
| | | | |||||
| | * | Make sure cursor delegate is parented. | Michael Brasser | 2010-03-29 | 2 | -0/+4 |
| | | | | | | | | | | | | setParentItem no longer sets QObject parent. | ||||
| | * | Allow just one dimension to be set, the other scaled accordingly | Warwick Allison | 2010-03-29 | 1 | -3/+11 |
| | | | | | | | | | | | | Task-number: QTBUG-8984 | ||||
| | * | Simplify import path. | Warwick Allison | 2010-03-29 | 4 | -59/+45 |
| | | | | | | | | | | | | Reviewed-by: mae | ||||
| | * | Removed unneeded code. | Roberto Raggi | 2010-03-29 | 2 | -10/+0 |
| | | | |||||
| | * | Update autotest a little | Alan Alpert | 2010-03-29 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | variant property was removed, and data property was altered, without updating this autotest. However the remaining failure for date appears to be genuine | ||||
| * | | Fix qdeclarativedom::loadDynamicProperty test | Aaron Kennedy | 2010-03-30 | 2 | -6/+10 |
| |/ | |||||
| * | Improve QML compiler statistics | Aaron Kennedy | 2010-03-29 | 2 | -9/+45 |
| | | |||||
| * | Use error enum not numbers | Warwick Allison | 2010-03-29 | 1 | -2/+2 |
| | | | | | | | | (easier to doc) | ||||
| * | Pass test. | Warwick Allison | 2010-03-29 | 1 | -0/+14 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 16 | -65/+200 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 1 | -4/+0 |
| | |\ | |||||
| | | * | QDeclarativeItem::setParentItem should not modify the QObject parent | Aaron Kennedy | 2010-03-29 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | QTBUG-5768 | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 7 | -50/+45 |
| | |\ \ | | | |/ | |||||
| | | * | Doc | Aaron Kennedy | 2010-03-29 | 1 | -45/+40 |
| | | | | | | | | | | | | | | | | QTBUG-7998 | ||||
| | | * | Visual test fixes. | Michael Brasser | 2010-03-29 | 5 | -4/+4 |
| | | | | |||||
| | | * | Doc | Aaron Kennedy | 2010-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | QTBUG-9273 | ||||
| | * | | Ensure currentIndex is updated when PathView items are removed/moved | Martin Jones | 2010-03-29 | 2 | -8/+37 |
| | |/ | |||||
| | * | Relayout items when Flow size changes. | Martin Jones | 2010-03-29 | 4 | -0/+103 |
| | | | | | | | | | | | | | | | | | | Also add Flow tests. Task-number: QTBUG-9421 | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 48 | -528/+1083 |
| | |\ | |||||
| | * | | Make sure the image reader thread is shutdown properly | Martin Jones | 2010-03-29 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 9 | -29/+32 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 690 | -318/+475 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-28 | 43 | -151/+399 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix change description: Import -> import | Martin Jones | 2010-03-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | doc | Warwick Allison | 2010-03-29 | 1 | -4/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9459 QTBUG-9458 | ||||
| * | | | | | | test error code too | Warwick Allison | 2010-03-29 | 1 | -3/+5 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Optimization: reduce allocations | Aaron Kennedy | 2010-03-29 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | Doc. | Michael Brasser | 2010-03-29 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Doc | Aaron Kennedy | 2010-03-29 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Remove "variant" QML properties | Aaron Kennedy | 2010-03-29 | 3 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | "property var a" works just as well | ||||
| * | | | | | Use QDateTime when specifying a "date" property in QML | Aaron Kennedy | 2010-03-29 | 5 | -4/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | QT-718 | ||||
| * | | | | | Update examples/declarative.pro | Yann Bodson | 2010-03-29 | 2 | -2/+7 |
| | | | | | | |||||
| * | | | | | Remove colorbrowser example | Yann Bodson | 2010-03-29 | 5 | -311/+0 |
| | | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 1 | -2/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix for qdeclarativelanguage::listProperties | Aaron Kennedy | 2010-03-29 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | doc | Warwick Allison | 2010-03-29 | 1 | -0/+4 |
| |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 3 | -6/+25 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix crash in QDeclarativePropertyMap. | Michael Brasser | 2010-03-29 | 3 | -6/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9439 | ||||
| * | | | | | | Remove total wrongness. | Warwick Allison | 2010-03-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base URL of engine is not what some people think it is. | ||||
| * | | | | | | Import path detail. | Warwick Allison | 2010-03-29 | 1 | -1/+8 |
| |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 23 | -48/+865 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add focus and key navigation example. | Yann Bodson | 2010-03-29 | 8 | -0/+209 |
| | | | | | | | |||||
| | * | | | | | Add example on how to use Qt widgets in qml. | Yann Bodson | 2010-03-29 | 4 | -0/+172 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-29 | 19 | -50/+77 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Add missing pro file. | Michael Brasser | 2010-03-29 | 1 | -0/+7 |
| | | | | | | | | |||||
| | | * | | | | | Fix memory leak and clean up deletion. | Bea Lam | 2010-03-29 | 1 | -8/+5 |
| | | | | | | | |