Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix visual model crash at shutdown due to dangling pointer | Aaron Kennedy | 2009-10-08 | 1 | -30/+46 |
| | |||||
* | Small optimization | Aaron Kennedy | 2009-10-08 | 1 | -3/+4 |
| | |||||
* | Zero bindingBits correctly | Aaron Kennedy | 2009-10-08 | 1 | -2/+3 |
| | |||||
* | Fix messed up merge | Aaron Kennedy | 2009-10-08 | 1 | -3/+3 |
| | |||||
* | Rename label to labeltext | Aaron Kennedy | 2009-10-08 | 1 | -5/+5 |
| | | | | Resolves scope collision between label property and label id | ||||
* | Fix crash | Aaron Kennedy | 2009-10-08 | 3 | -1/+24 |
| | |||||
* | Call QApplication::exit() repeatedly | Aaron Kennedy | 2009-10-08 | 1 | -3/+5 |
| | | | | | This is necessary incase we want to exit before we've entered the event loop. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 52 | -1081/+1061 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-08 | 16 | -38/+236 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-08 | 12 | -26/+223 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 34 | -734/+716 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | doc cleanup | Yann Bodson | 2009-10-08 | 4 | -3/+4 |
| | | | | | |||||
| | | * | | Allow dial to be built as an exe. | Martin Jones | 2009-10-08 | 3 | -0/+37 |
| | | | | | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 77 | -756/+1341 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 359 | -2531/+5081 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Auto tests for QmlTimer | Martin Jones | 2009-10-06 | 5 | -23/+182 |
| | | | | | | | |||||
| | * | | | | | Rename preserveSelection to persistentSelection | Alan Alpert | 2009-10-08 | 4 | -12/+13 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Task-number: QT-1113 | ||||
| * | | | | | Fix relative-URLs of test scripts | Warwick Allison | 2009-10-08 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Font-portable. | Warwick Allison | 2009-10-08 | 6 | -301/+220 |
| | | | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-07 | 34 | -733/+714 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/tutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc | ||||
| | * | | | | doc cleanup | Yann Bodson | 2009-10-07 | 9 | -322/+322 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-07 | 2 | -0/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Fix QFxTextInput | Alan Alpert | 2009-10-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was accepting input on both press and release, for some reason | ||||
| | | * | | | | Smaller gif file for the advanced tutorial | Alan Alpert | 2009-10-07 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | move files to avoid duplication. | Yann Bodson | 2009-10-07 | 8 | -40/+20 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-07 | 1 | -36/+44 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 5 | -0/+119 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 76 | -748/+1314 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | Compile on Symbian. | Martin Jones | 2009-10-07 | 1 | -36/+44 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-07 | 82 | -756/+1460 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | | Update 'hello world' tutorial. | Yann Bodson | 2009-10-07 | 14 | -319/+192 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | typos | Warwick Allison | 2009-10-07 | 7 | -12/+12 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Use correct file case | Aaron Kennedy | 2009-10-08 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Update to use new QScriptDeclarativeClass API | Aaron Kennedy | 2009-10-08 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Tweak QScriptDeclarativeClass API to not be so silly | Aaron Kennedy | 2009-10-08 | 4 | -28/+45 |
| | | | | | | |||||
* | | | | | | Make qmlecmascript:selfDeletingBinding pass | Aaron Kennedy | 2009-10-08 | 4 | -133/+182 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expressions and bindings must not reference data following their evalutation incase their object has been deleted. To solve this, the needed data is separated into a reference counted QmlExpressionData and QmlBindingData object. | ||||
* | | | | | | Self deleting binding test | Aaron Kennedy | 2009-10-08 | 4 | -0/+63 |
| | | | | | | |||||
* | | | | | | Fix test case | Aaron Kennedy | 2009-10-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qWait() enters a nested event loop, so delete laters weren't being processed. | ||||
* | | | | | | Remove bogus assert | Aaron Kennedy | 2009-10-07 | 1 | -1/+0 |
| | | | | | | |||||
* | | | | | | Fix test case | Aaron Kennedy | 2009-10-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qWait() enters a nested event loop, so delete laters weren't being processed. | ||||
* | | | | | | Add Object.destroy(int delay) parameter | Aaron Kennedy | 2009-10-07 | 1 | -3/+5 |
| | | | | | | |||||
* | | | | | | Fix test | Aaron Kennedy | 2009-10-07 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-07 | 590 | -4649/+8338 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into test Conflicts: demos/declarative/samegame/content/samegame.js tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | ||||
| * | | | | | Get two of those new autotests to pass. | Alan Alpert | 2009-10-07 | 4 | -21/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | The third will not pass until QT-2240 is fixed. | ||||
| * | | | | | Add three failing tests to the QML ECMAscript autotest | Alan Alpert | 2009-10-07 | 5 | -0/+121 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Tests the creation, deletion and toString functions for QML objects. Task-number: QT-2252 | ||||
| * | | | | Switch Same Game tutorial to using snippets properly | Alan Alpert | 2009-10-07 | 17 | -367/+73 |
| | | | | | |||||
| * | | | | SameGame tutorial images | Alan Alpert | 2009-10-07 | 4 | -0/+0 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-07 | 66 | -62/+1608 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-07 | 19 | -49/+54 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-07 | 358 | -2537/+5050 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |