Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 5 | -10/+65 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Incorporate latest optical theory. | Warwick Allison | 2009-10-28 | 2 | -3/+15 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-28 | 135 | -517/+1037 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Test visibility. | Warwick Allison | 2009-10-28 | 2 | -4/+16 |
| | | | | | | | | | | | | Add refs back to JIRA items. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-28 | 29 | -160/+351 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-27 | 74 | -266/+2198 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Test remote QML content | Warwick Allison | 2009-10-27 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | (test data will appear on qt-test-server.qt-test-net shortly) | ||||
| * | | | | Fix remote content loading for absolute URLs | Warwick Allison | 2009-10-27 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | (the test is pending...) | ||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 35 | -61/+106 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-28 | 101 | -318/+622 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 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-10-28 | 54 | -95/+227 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | | | cleanup | Yann Bodson | 2009-10-28 | 20 | -42/+42 |
| | | | | | | | |||||
| * | | | | | | Doc. | Michael Brasser | 2009-10-28 | 15 | -19/+64 |
| | | | | | | | |||||
* | | | | | | | Make test more robust | Aaron Kennedy | 2009-10-28 | 1 | -8/+17 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 14 | -84/+150 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 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-10-28 | 73 | -383/+847 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | | Must delete query objects once disconnected. | Bea Lam | 2009-10-28 | 1 | -1/+8 |
| | | | | | | | | |||||
| * | | | | | | | Show contents of list properties within the debugger (like the Creator | Bea Lam | 2009-10-28 | 10 | -76/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugger). Also add Mode arg to ExpressionQueryWidget constructor. | ||||
| * | | | | | | | Auto-select first tree item after reload. | Bea Lam | 2009-10-28 | 2 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Fix crash bug where watch is already deleted | Bea Lam | 2009-10-28 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Check values when remove() is called | Bea Lam | 2009-10-28 | 1 | -4/+8 |
| | | | | | | | | |||||
* | | | | | | | | Make more mac friendly | Aaron Kennedy | 2009-10-28 | 29 | -6/+51 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-28 | 41 | -184/+391 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | Whoops | Aaron Kennedy | 2009-10-28 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Ensure all tests appear in pro file | Aaron Kennedy | 2009-10-28 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Use a nicer face image | Aaron Kennedy | 2009-10-28 | 8 | -0/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 13 | -135/+94 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | 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-10-28 | 15 | -28/+236 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | | | | | cleanup | Yann Bodson | 2009-10-28 | 10 | -15/+15 |
| | | | | | | | | | |||||
| | * | | | | | | | cleanup | Yann Bodson | 2009-10-28 | 3 | -120/+79 |
| | | | | | | | | | |||||
| * | | | | | | | | "Compile" | Aaron Kennedy | 2009-10-28 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-28 | 26 | -201/+377 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | 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-10-28 | 9 | -27/+129 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-28 | 21 | -182/+327 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | | Doc | Michael Brasser | 2009-10-28 | 2 | -1/+27 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | make TextElideMode an enum of QFxText. | Yann Bodson | 2009-10-28 | 3 | -18/+23 |
| | | | | | | | | |||||
| * | | | | | | | Test for QT-2373 | Aaron Kennedy | 2009-10-28 | 3 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that transient binding errors are not displayed. | ||||
| * | | | | | | | Do not display transient binding errors | Aaron Kennedy | 2009-10-28 | 7 | -10/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During QML startup, it is common to have "errors" in bindings as the apps state stabilizes. These are not real errors, but just a consequence of implementing a declarative UI in an imperative world. Now during startup, the display of errors is delayed until the startup completes, and then only bindings that are still in an error state are displayed. QT-2373 | ||||
| * | | | | | | | Add a QmlExpression::error() method | Aaron Kennedy | 2009-10-28 | 8 | -21/+107 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | QmlExpression should not print errors itself. This is the responsibility of the caller. | ||||
* | | | | | | | Fix dynamic example | Alan Alpert | 2009-10-28 | 2 | -3/+15 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Includes adding a comment to the positioners to alert others that you shouldn't use anchors as well. | ||||
* | | | | | | Fix bug where repeater would add spacing for 0 sized children | Alan Alpert | 2009-10-28 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 3 | -40/+42 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | 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-10-28 | 2 | -14/+41 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | | | | | QT-2382 | Yann Bodson | 2009-10-28 | 3 | -40/+42 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-28 | 12 | -116/+183 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | dynamic example now meets minimum aesthetic requirements | Alan Alpert | 2009-10-28 | 2 | -14/+41 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2270 Reviewed-by: Yann Bodson | ||||
| * | | | | | Better dragging of items for dynamic example | Alan Alpert | 2009-10-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse is no longer at 0,0 of dragged item, but rather at the same point as the original click. | ||||
| * | | | | | Dynamic example now has more droppable Items | Alan Alpert | 2009-10-28 | 10 | -51/+91 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | The example is nearly done, just needs a little more aesthetic transfiguration. Also this commit introduces some generic components that could be easily used to make a game like ktuberling. | ||||
* | | | | | Mode improvement to strictly enforced highlight range movement. | Martin Jones | 2009-10-28 | 4 | -18/+92 |
| | | | | | |||||
* | | | | | Ensure that the Follows handle the target value changing unexpectedly. | Martin Jones | 2009-10-28 | 2 | -6/+6 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | If the target's property was changed elsewhere while the Follow wasn't running, it would fail to start when a source identical to its current source valule was set. |