Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-17 | 17 | -101/+198 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Distinguish between reversing and rewinding a state change. | Michael Brasser | 2009-11-17 | 6 | -47/+131 |
| | | | | | | | | Task-number: QTBUG-5769 | ||||
| * | Fix binding (it should be resulted to arrays, since SQL and JS are not) | Warwick Allison | 2009-11-17 | 1 | -2/+2 |
| | | |||||
| * | Error checking and tests for them in ListModel | Warwick Allison | 2009-11-17 | 1 | -8/+14 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-17 | 6 | -65/+71 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | More animation autotests. | Michael Brasser | 2009-11-17 | 3 | -29/+25 |
| | | | |||||
| * | | NOTIFY on children changed | Warwick Allison | 2009-11-17 | 2 | -1/+9 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-16 | 5 | -43/+31 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Use QDir::separator() and follow no-trailing-slash convention. | Warwick Allison | 2009-11-16 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | Fixes QTBUG-5841 | ||||
| * | | | | doc | Warwick Allison | 2009-11-16 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-16 | 1 | -2/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-16 | 4 | -29/+41 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | doc | Warwick Allison | 2009-11-13 | 2 | -4/+0 |
| | | | | | | | |||||
* | | | | | | | QMetaObjectBuilder tests | Aaron Kennedy | 2009-11-17 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | QmlInstruction autotest | Aaron Kennedy | 2009-11-17 | 5 | -53/+70 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-16 | 3 | -21/+32 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Loader network tests | Martin Jones | 2009-11-16 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-16 | 3 | -23/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-16 | 5 | -31/+46 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | More ListView tests. | Martin Jones | 2009-11-16 | 2 | -20/+31 |
| | |_|/ / | |/| | | | |||||
* | | | | | Tests | Aaron Kennedy | 2009-11-16 | 3 | -36/+46 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-16 | 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 ↵ | Michael Brasser | 2009-11-16 | 12 | -396/+267 |
| |\ \ \ | | | |/ | | |/| | | | | | into kinetic-declarativeui | ||||
| * | | | Autotests. | Michael Brasser | 2009-11-16 | 1 | -2/+5 |
| | | | | |||||
* | | | | Remove dead code | Aaron Kennedy | 2009-11-16 | 3 | -23/+0 |
| |/ / |/| | | |||||
* | | | QmlEngine tests | Aaron Kennedy | 2009-11-16 | 1 | -11/+5 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-16 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/declarative.pro | ||||
| * | | | Avoid clipping last pixel of text in QML in some cases | Eskil Abrahamsen Blomfeldt | 2009-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would floor the width of the text layout and clip the output to this, hence cutting away the last pixel of the text in cases where the text width was not pixel aligned. Task-number: QTBUG-5431 Reviewed-by: Gunnar | ||||
| * | | | Build on non-g++ compilers. | Andreas Aardal Hanssen | 2009-11-13 | 1 | -2/+4 |
| | |/ | |/| | | | | | | | | | | | | | | | | Uncommenting these lines might have been a mistake during the merge (sha1 14821863b830b85ccb29df217a52f1ca52c9c421). Reviewed-by: kkoehne | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 1 | -18/+18 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | unwarn | Warwick Allison | 2009-11-13 | 1 | -18/+18 |
| | | | | |||||
* | | | | Don't enable gcov flags | Aaron Kennedy | 2009-11-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 6 | -227/+155 |
|\ \ \ \ | | |/ / | |/| | | | | | | 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 | 2009-11-13 | 129 | -787/+720 |
| |\ \ \ | | |/ / | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-13 | 8 | -220/+212 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | WebView tests and testability. | Warwick Allison | 2009-11-13 | 3 | -93/+154 |
| | | | | | |||||
| | * | | | Remove unused methods of QmlListAccessor. | Martin Jones | 2009-11-13 | 2 | -133/+0 |
| | | |/ | | |/| | |||||
| * | | | Fix bug in WATCH_OBJECT_R message and add more tests. | Bea Lam | 2009-11-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | XMLHttpRequest tests | Aaron Kennedy | 2009-11-13 | 1 | -15/+32 |
| |_|/ |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-13 | 18 | -133/+106 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/globalobject.qdoc | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 7 | -93/+28 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2009-11-13 | 103 | -201/+235 |
| | |\ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | Cleanup. | Michael Brasser | 2009-11-13 | 6 | -76/+19 |
| | | | | | |||||
| | * | | | Enforce unique role names for XmlListModel. | Michael Brasser | 2009-11-13 | 1 | -17/+9 |
| | | | | | |||||
| * | | | | Make 'public' (testable) | Warwick Allison | 2009-11-13 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-13 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | All items in list should have z: 1 | Martin Jones | 2009-11-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-11-13 | 97 | -145/+147 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui |