Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Incorrect use of Script {} | Aaron Kennedy | 2009-10-08 | 3 | -34/+31 |
| | |||||
* | Rename label to labeltext | Aaron Kennedy | 2009-10-08 | 1 | -5/+5 |
| | | | | Resolves scope collision between label property and label id | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-07 | 43 | -690/+683 |
|\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into test Conflicts: demos/declarative/samegame/content/samegame.js tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | ||||
| * | Refactor tileSize to the gameCanvas item | Alan Alpert | 2009-10-07 | 2 | -13/+13 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-06 | 32 | -623/+613 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | lowercase ids | Yann Bodson | 2009-10-06 | 11 | -201/+202 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-06 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Fix following API changes. | Bea Lam | 2009-10-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | lowercase ids | Yann Bodson | 2009-10-06 | 20 | -420/+409 |
| | |/ | |||||
| * | | Consistent Commenting in Samegame | Alan Alpert | 2009-10-05 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-05 | 10 | -50/+50 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Change .sci syntax to match BorderImage. | Yann Bodson | 2009-10-05 | 10 | -50/+50 |
| | | | |||||
| * | | Minor fixes to flickr example. | Michael Brasser | 2009-10-05 | 1 | -4/+6 |
| |/ | |||||
* | | Reenable types/enums and move scripts into an isolated scope | Aaron Kennedy | 2009-10-05 | 2 | -2/+7 |
| | | |||||
* | | Prevent writes to the global object | Aaron Kennedy | 2009-10-05 | 1 | -14/+14 |
| | | | | | | | | Also add toString() method to qobjects | ||||
* | | Improve script lookup caching | Aaron Kennedy | 2009-10-05 | 1 | -0/+3 |
|/ | |||||
* | * use alias in CalcButton.qml | Yann Bodson | 2009-10-01 | 2 | -6/+5 |
| | | | | * do not set a z value (broken with positioners atm) | ||||
* | Fix small bugs in flick-mobile | Yann Bodson | 2009-09-30 | 3 | -9/+17 |
| | |||||
* | Use new property name | Aaron Kennedy | 2009-09-23 | 1 | -2/+2 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-22 | 1 | -3/+3 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Renaming: QFxView -> QmlView | Yann Bodson | 2009-09-22 | 1 | -3/+3 |
| | | |||||
* | | Clean up Same Game JS | Alan Alpert | 2009-09-22 | 1 | -37/+12 |
|/ | | | | Delayed loading is never used and is poorly implemented, so remove it. | ||||
* | Rename samegame | Aaron Kennedy | 2009-09-21 | 1 | -0/+0 |
| | |||||
* | Rename samegame | Aaron Kennedy | 2009-09-21 | 1 | -0/+0 |
| | |||||
* | Add a rotated flickr-mobile version | Aaron Kennedy | 2009-09-21 | 1 | -0/+10 |
| | |||||
* | Fixed UrlBar to not clip off top 3 pixels of the page | Nigel Hietala | 2009-09-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-10 | 4 | -6/+6 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Update demos to work with API changes | Alan Alpert | 2009-09-10 | 4 | -6/+6 |
| | | | | | | | | Affected are flickr and twitter. | ||||
* | | Follow renamed to SpringFollow. | Martin Jones | 2009-09-10 | 2 | -2/+3 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-09 | 1 | -5/+3 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Positioners now implictly have the height and width of the childrenRect | Alan Alpert | 2009-09-09 | 1 | -5/+3 |
| | | | | | | | | | | Also removed the now uneccesary height and width bindings from the twitter demo login screen. | ||||
* | | Move ComponentInstance functionality into Loader | Martin Jones | 2009-09-09 | 1 | -2/+2 |
|/ | |||||
* | Size the list area correctly. | Martin Jones | 2009-09-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-07 | 1 | -2/+2 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-09-07 | 1 | -2/+2 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Get calculator demo running again. | Michael Brasser | 2009-09-07 | 1 | -2/+2 |
| | | | |||||
* | | | Remove KeyProxy in favour of the Keys.forwardTo attached property. | Martin Jones | 2009-09-07 | 5 | -28/+9 |
| |/ |/| | |||||
* | | Fix scrollbar after API changes. | Yann Bodson | 2009-09-07 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-04 | 33 | -30/+1066 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxflickable.cpp | ||||
| * | Fix some twitter demo bugs | Alan Alpert | 2009-09-03 | 3 | -9/+11 |
| | | | | | | | | Includes making the update button work and clearing the post box on post | ||||
| * | Better default behaviour for twitter demo. | Alan Alpert | 2009-09-03 | 1 | -0/+1 |
| | | |||||
| * | Differentiate between loading and error states. | Alan Alpert | 2009-09-03 | 1 | -1/+7 |
| | | |||||
| * | Close dialogs if they press new game | Alan Alpert | 2009-09-03 | 1 | -2/+7 |
| | | | | | | | | Also only has one dialog shown when you win. | ||||
| * | Move minehunt and twitter to demos directory | Alan Alpert | 2009-09-03 | 23 | -0/+1020 |
| | | | | | | | | | | Minehunt is more a demo than an example, and the twitter app goes with the flickr app. | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-02 | 7 | -27/+27 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Disallow using typenames as ids | Aaron Kennedy | 2009-09-02 | 7 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now illegal: import Qt 4.6 Item { id: Item } as is import Qt 4.6 Item { id: Text } | ||||
| * | | Slightly better name dialog for SameGame | Alan Alpert | 2009-09-02 | 1 | -1/+2 |
| | | | |||||
| * | | SameGame score XSLT now sorts by score. | Alan Alpert | 2009-09-02 | 1 | -0/+1 |
| |/ | |||||
* | | Smooth the rendering in the tiles, not of the tiles. | Warwick Allison | 2009-09-04 | 1 | -1/+1 |
| | | | | | | | | Turn smoothing on in webbrowsser demo. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-02 | 8 | -10/+118 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |