Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-19 | 8 | -40/+89 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-19 | 1 | -2/+4 |
| |\ | | | | | | | | | | 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-19 | 3 | -6/+17 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | Make sure we restore the base state correctly after the base state changes. | Michael Brasser | 2009-11-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | This worked correctly as long as there was a transition between the states. Now it works correctly with no transition as well. | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-19 | 3 | -6/+17 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-19 | 4 | -5/+16 |
| | |\ \ | | | |/ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | 'when' property has to be before 'value' property in Binding element | Martin Jones | 2009-11-18 | 2 | -5/+16 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-5477 | ||||
| | * | | Update Package test and fix crash. | Martin Jones | 2009-11-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix headers. | Warwick Allison | 2009-11-18 | 2 | -32/+32 |
| | | | | |||||
| * | | | Pass error messages through to WebView users. | Warwick Allison | 2009-11-18 | 2 | -0/+36 |
| | |/ | |/| | |||||
* | | | Rename QML Object to QtObject | Aaron Kennedy | 2009-11-19 | 1 | -1/+1 |
|/ / | |||||
* | | Doc. | Michael Brasser | 2009-11-18 | 2 | -3/+8 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-18 | 4 | -5/+17 |
|\ \ | | | | | | | | | | 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-18 | 9 | -23/+55 |
| |\ \ | | |/ | | | | | | | into kinetic-declarativeui | ||||
| | * | ListView tests and fixes. | Martin Jones | 2009-11-18 | 3 | -5/+13 |
| | | | |||||
| * | | Set state to QmlGraphicsBorderImage::Error if local file is not found, | Bea Lam | 2009-11-18 | 1 | -0/+4 |
| | | | | | | | | | | | | and add more unit tests. | ||||
* | | | declarative.pro GCOV test | Aaron Kennedy | 2009-11-18 | 1 | -2/+4 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-18 | 6 | -192/+304 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Minor doc fixes for animation elements. | Justin McPherson | 2009-11-18 | 1 | -12/+10 |
| |/ | | | | | | | Reviewed-by: Martin Jones | ||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-18 | 3 | -75/+215 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-18 | 17 | -123/+355 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Don't make assumptions about when SQLITE creates database files. | Warwick Allison | 2009-11-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update SQL database support to current HTML5 specification. | Warwick Allison | 2009-11-18 | 1 | -58/+187 |
| | | | | |||||
| | * | | Partial fix for QTBUGT-5845 | Warwick Allison | 2009-11-17 | 2 | -17/+28 |
| | | | | |||||
| * | | | tests | Aaron Kennedy | 2009-11-18 | 2 | -105/+79 |
| | |/ | |/| | |||||
* | | | Doc. | Martin Jones | 2009-11-18 | 4 | -4/+12 |
| | | | |||||
* | | | More PathView testing | Martin Jones | 2009-11-18 | 3 | -2/+20 |
|/ / | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-17 | 2 | -18/+11 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-17 | 2 | -11/+7 |
| |\ \ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-17 | 3 | -2/+137 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | tests | Aaron Kennedy | 2009-11-17 | 1 | -9/+3 |
| | | | | | |||||
| * | | | | AnchorChanges autotests | Yann Bodson | 2009-11-17 | 1 | -9/+8 |
| | | | | | |||||
* | | | | | More repeater tests. | Martin Jones | 2009-11-17 | 1 | -1/+3 |
| |_|/ / |/| | | | |||||
* | | | | Fix AnchorChange when multiple states in a stategroup are involved. | Michael Brasser | 2009-11-17 | 1 | -2/+4 |
|/ / / | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-17 | 23 | -156/+271 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | 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 |
| | | | | | | | |