summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-198-40/+89
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-191-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 Brasser2009-11-193-6/+17
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | * | Make sure we restore the base state correctly after the base state changes.Michael Brasser2009-11-191-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 Allison2009-11-193-6/+17
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-194-5/+16
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | 'when' property has to be before 'value' property in Binding elementMartin Jones2009-11-182-5/+16
| | | | | | | | | | | | | | | | Task-number: QTBUG-5477
| | * | Update Package test and fix crash.Martin Jones2009-11-181-1/+1
| | | |
| * | | Fix headers.Warwick Allison2009-11-182-32/+32
| | | |
| * | | Pass error messages through to WebView users.Warwick Allison2009-11-182-0/+36
| | |/ | |/|
* | | Rename QML Object to QtObjectAaron Kennedy2009-11-191-1/+1
|/ /
* | Doc.Michael Brasser2009-11-182-3/+8
| |
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-184-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 Lam2009-11-189-23/+55
| |\ \ | | |/ | | | | | | into kinetic-declarativeui
| | * ListView tests and fixes.Martin Jones2009-11-183-5/+13
| | |
| * | Set state to QmlGraphicsBorderImage::Error if local file is not found,Bea Lam2009-11-181-0/+4
| | | | | | | | | | | | and add more unit tests.
* | | declarative.pro GCOV testAaron Kennedy2009-11-181-2/+4
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-186-192/+304
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Minor doc fixes for animation elements.Justin McPherson2009-11-181-12/+10
| |/ | | | | | | Reviewed-by: Martin Jones
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-183-75/+215
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-1817-123/+355
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Don't make assumptions about when SQLITE creates database files.Warwick Allison2009-11-181-2/+2
| | | |
| | * | Update SQL database support to current HTML5 specification.Warwick Allison2009-11-181-58/+187
| | | |
| | * | Partial fix for QTBUGT-5845Warwick Allison2009-11-172-17/+28
| | | |
| * | | testsAaron Kennedy2009-11-182-105/+79
| | |/ | |/|
* | | Doc.Martin Jones2009-11-184-4/+12
| | |
* | | More PathView testingMartin Jones2009-11-183-2/+20
|/ /
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-172-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 Bodson2009-11-172-11/+7
| |\ \ | | | | | | | | | | | | into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-173-2/+137
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | testsAaron Kennedy2009-11-171-9/+3
| | | | |
| * | | | AnchorChanges autotestsYann Bodson2009-11-171-9/+8
| | | | |
* | | | | More repeater tests.Martin Jones2009-11-171-1/+3
| |_|/ / |/| | |
* | | | Fix AnchorChange when multiple states in a stategroup are involved.Michael Brasser2009-11-171-2/+4
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-1723-156/+271
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-1717-101/+198
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Distinguish between reversing and rewinding a state change.Michael Brasser2009-11-176-47/+131
| | |/ | | | | | | | | | Task-number: QTBUG-5769
| | * Fix binding (it should be resulted to arrays, since SQL and JS are not)Warwick Allison2009-11-171-2/+2
| | |
| | * Error checking and tests for them in ListModelWarwick Allison2009-11-171-8/+14
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-176-65/+71
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * More animation autotests.Michael Brasser2009-11-173-29/+25
| | | |
| | * | NOTIFY on children changedWarwick Allison2009-11-172-1/+9
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-161-1/+1
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-165-43/+31
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Use QDir::separator() and follow no-trailing-slash convention.Warwick Allison2009-11-162-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes QTBUG-5841
| | * | | | docWarwick Allison2009-11-161-2/+7
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-161-2/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-164-29/+41
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | docWarwick Allison2009-11-132-4/+0
| | | | | | | |
| * | | | | | | QMetaObjectBuilder testsAaron Kennedy2009-11-171-2/+3
| | | | | | | |