Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 2 | -2/+4 |
| | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp | ||||
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2010-02-04 | 34 | -363/+550 |
|\ | | | | | | | 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 | 29 | -356/+494 |
| |\ | | | | | | | | | | 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 | 4 | -15/+70 |
| | |\ | | | | | | | | | | | | | 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 | 1 | -4/+3 |
| | | | | |||||
| | | * | 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 | 4 | -8/+14 |
| | |\ \ | | | |/ | | | | | | | | | 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 | 3 | -6/+6 |
| | | | |/ | | | |/| | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 9 | -122/+109 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | 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 |
| | | | | |||||
| | * | | 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 | 10 | -10/+114 |
| | |\ | | | | | | | | | | | | | 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 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 75 | -3461/+4324 |
|\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp | ||||
| * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2010-01-29 | 10 | -143/+451 |
| |\ \ | | |/ | | | | | | | into kinetic-declarativeui | ||||
| | * | Add new files. | Martin Jones | 2010-01-29 | 2 | -0/+163 |
| | | | |||||
| | * | Move image network access into a separate thread, with decoding. | Martin Jones | 2010-01-29 | 6 | -136/+279 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-01-29 | 23 | -561/+615 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Doc. | Michael Brasser | 2010-01-29 | 1 | -2/+4 |
| | | | |