Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318466 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ... | ||||
| * | Add some painting benchmarks. | Martin Jones | 2010-02-05 | 2 | -0/+282 |
| | | | | | | | | Task-number: QT-2780 | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-04 | 2 | -0/+46 |
| |\ | |||||
| | * | Fix headers::licenseCheck autotest failure | Leonardo Sobral Cunha | 2010-02-04 | 1 | -0/+40 |
| | | | |||||
| | * | Re-add accidentally deleted file | Aaron Kennedy | 2010-02-04 | 1 | -0/+6 |
| | | | |||||
| * | | Make sure cookies are saved. | Martin Jones | 2010-02-04 | 1 | -1/+4 |
| |/ | |||||
| * | Test SizeItemToLoader to SizeLoaderToItem resizeMode change. | Martin Jones | 2010-02-04 | 2 | -0/+13 |
| | | | | | | | | Task-number: QT-2376 | ||||
| * | Document QmlContext ownership. | Martin Jones | 2010-02-04 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 2589 | -35/+318119 |
| |\ | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp | ||||
| | * | Add bug note. | Michael Brasser | 2010-02-04 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2010-02-04 | 404 | -1731/+4571 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-04 | 7 | -177/+310 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | Document margins property | Alan Alpert | 2010-02-03 | 1 | -0/+2 |
| | | | | | |||||
| | | | * | Augment documentation | Alan Alpert | 2010-02-03 | 2 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | Document automatic signal handlers and QmlViewer.Screen. | ||||
| | | | * | doc: There is no easeNone, it is called easeLinear | Thorbjørn Lindeijer | 2010-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: dt | ||||
| | | | * | doc: Converted the basic types page to use \qmlbasictype | Martin Smith | 2010-02-03 | 1 | -173/+257 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The changes to qdoc3 to support this will be in the 4.7 master branch. | ||||
| | | | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2010-02-03 | 383 | -1540/+4115 |
| | | | |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | Focus focusScope from focusing for focusOnPress | Alan Alpert | 2010-02-03 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6739 | ||||
| | | * | | | Document calling C++ methods from QML. | Martin Jones | 2010-02-04 | 1 | -0/+95 |
| | | | |/ | | | |/| | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 4 | -24/+42 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp | ||||
| | | | * | | Don't create one QNetworkAccessManager per XMLHttpRequest | Aaron Kennedy | 2010-02-03 | 4 | -31/+49 |
| | | | | | | |||||
| | | * | | | Really run image reader in its own thread. | Martin Jones | 2010-02-03 | 8 | -163/+140 |
| | | | | | | |||||
| | | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 8 | -12/+181 |
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | XMLHttpRequest redirection | Aaron Kennedy | 2010-02-03 | 8 | -12/+181 |
| | | | | | | |||||
| | | * | | | We use JavaScript, not ECMAScript. | Martin Jones | 2010-02-03 | 14 | -41/+41 |
| | | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-7720 | ||||
| | | * | | update Image.paintedWidth and Image.paintedHeight when the source changes | Yann Bodson | 2010-02-03 | 2 | -0/+5 |
| | | | | | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 1 | -2/+5 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 5 | -25/+80 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | | | Don't enforce lower-case starting letters for ids yet; just print a | Bea Lam | 2010-02-03 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning for now. | ||||
| | | * | | | | Remove debug. | Martin Jones | 2010-02-03 | 1 | -4/+0 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | Add a PathView.onPath property to help deal with unrequested items. | Martin Jones | 2010-02-03 | 2 | -15/+66 |
| | | | | | | |||||
| | | * | | | Avoid crash on shutdown if model is destroyed before view. | Martin Jones | 2010-02-03 | 2 | -6/+10 |
| | | | | | | |||||
| | | * | | | Compile. | Martin Jones | 2010-02-03 | 1 | -4/+4 |
| | | |/ / | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 11 | -17/+182 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | | Test case for QTBUG-7860 | Aaron Kennedy | 2010-02-03 | 2 | -0/+16 |
| | | | | | | |||||
| | | | * | | Missing files | Aaron Kennedy | 2010-02-03 | 3 | -0/+44 |
| | | | | | | |||||
| | | | * | | Honor default property ordering | Aaron Kennedy | 2010-02-03 | 1 | -2/+49 |
| | | | | | | |||||
| | | | * | | Test for default property ordering | Aaron Kennedy | 2010-02-03 | 2 | -0/+49 |
| | | | | | | |||||
| | | | * | | Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan. | Joona Petrell | 2010-02-03 | 2 | -6/+6 |
| | | | | | | |||||
| | | | * | | Ensure unrequested items are placed outside the visible area. | Martin Jones | 2010-02-03 | 2 | -9/+18 |
| | | | | | | |||||
| | | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 5 | -8/+15 |
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-03 | 1 | -2/+8 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 3 | -6/+6 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | | * | | | Fix Loader crash when Loader.item causes a new item to be loaded | Martin Jones | 2010-02-03 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2338 | ||||
| | | | * | | | | Compile. | Warwick Allison | 2010-02-03 | 4 | -6/+7 |
| | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 230 | -902/+2761 |
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-02 | 3 | -2/+31 |
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | | * | | Handle wheel events in Flickable. | Martin Jones | 2010-02-02 | 3 | -2/+31 |
| | | | | | | | |||||
| | | | * | | | The depot (4.6.2) does not have the Value patch yet, adjust version checks | Warwick Allison | 2010-02-02 | 3 | -6/+6 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | accordingly. | ||||
| | | | * | | Fix insertion and deletion of multiple items in GridView. | Martin Jones | 2010-02-02 | 5 | -119/+79 |
| | | | | | |