Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clean up QmlImageReader thread on engine destruction. | Martin Jones | 2010-02-05 | 3 | -12/+21 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-05 | 314 | -9/+106257 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ... | ||||
| * | Test SizeItemToLoader to SizeLoaderToItem resizeMode change. | Martin Jones | 2010-02-04 | 1 | -0/+6 |
| | | | | | | | | Task-number: QT-2376 | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 314 | -9/+106251 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | 102 | -686/+1222 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Document margins property | Alan Alpert | 2010-02-03 | 1 | -0/+2 |
| | | | | |||||
| | | * | doc: There is no easeNone, it is called easeLinear | Thorbjørn Lindeijer | 2010-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: dt | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2010-02-03 | 97 | -679/+1166 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | 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 | 7 | -159/+138 |
| | | | | | | |||||
| | | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 1 | -12/+32 |
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | | * | XMLHttpRequest redirection | Aaron Kennedy | 2010-02-03 | 1 | -12/+32 |
| | | | | | | |||||
| | | | * | | We use JavaScript, not ECMAScript. | Martin Jones | 2010-02-03 | 2 | -3/+3 |
| | | | |/ | | | | | | | | | | | | | | | | 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 | 5 | -17/+73 |
| | | | |\ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | | * | Honor default property ordering | Aaron Kennedy | 2010-02-03 | 1 | -2/+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 | 76 | -445/+773 |
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | 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 | 4 | -114/+72 |
| | | | | | | |||||
| | | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2010-02-02 | 67 | -323/+664 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp | ||||
| | | | * | | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 2 | -3/+6 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786 | ||||
| | | | * | | Fix QList<QObject*> as a model. Add docs and example. | Martin Jones | 2010-02-01 | 1 | -2/+3 |
| | | | | | | |||||
| | | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-01 | 11 | -10/+120 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | | * | | Tests for NaN values in the property x, y, widht and height setters of | Marco Bubke | 2010-02-01 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem and QmlGraphicsItem Task-number: BAUHAUS-268 Reviewed-by: Thomas Hartmann | ||||
| | | | | * | | Add transformOriginChanged signal to QmlGraphicsItem | Marco Bubke | 2010-02-01 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed that Bauhaus is reflecting the changes in QmlGraphicsItem. Task-number: BAUHAUS-125 Reviewed-by: Kai Koehne | ||||
| | | | * | | | Compile on machines without SCHED_IDLE | Martin Jones | 2010-02-01 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Focus focusScope from focusing for focusOnPress | Alan Alpert | 2010-02-03 | 2 | -3/+18 |
| | | | |/ / | | | |/| | | | | | | | | | | | | | | Task-number: QTBUG-6739 | ||||
| | | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-01 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Don't use statics for type definition, at least for plugin modules. | Warwick Allison | 2010-02-01 | 3 | -3/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798 | ||||
| | * | | | | | Fix elision and multilength strings when resizing a Text element. | Michael Brasser | 2010-02-04 | 1 | -1/+10 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | They were incorrectly wrapping when the width changed. Task-number: QTBUG-7477 | ||||
| | * | | | | Support animating attached properties. | Michael Brasser | 2010-02-01 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-5580 | ||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-01 | 239 | -5147/+7409 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp |