Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Yann Bodson | 2009-10-28 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | "Compile" | Aaron Kennedy | 2009-10-28 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | cleanup | Yann Bodson | 2009-10-28 | 17 | -33/+33 | |
| | | | |/ / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | SameGame cleans up blocks now. | Alan Alpert | 2009-10-27 | 1 | -0/+1 | |
| | | | * | | | | | | | | | | | | | | | make remotable | Warwick Allison | 2009-10-26 | 2 | -4/+4 | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Warwick Allison | 2009-10-26 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | Flip around perspective origin | Aaron Kennedy | 2009-10-26 | 1 | -0/+1 | |
| | | | * | | | | | | | | | | | | | | | | Allow flickr demo to be remote. | Warwick Allison | 2009-10-26 | 1 | -0/+10 | |
| | | | |/ / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 7 | -11/+22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | Update ScriptAction and StateChangeScript to use QmlScriptString. | Michael Brasser | 2009-10-23 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | Start updating state and animation docs. | Michael Brasser | 2009-10-22 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 1 | -0/+4 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 24 | -208/+217 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | Doc | Aaron Kennedy | 2009-10-13 | 1 | -0/+0 | |
| | | | * | | | | | | | | | | | | | | | | | | Incorrect use of Script {} | Aaron Kennedy | 2009-10-08 | 3 | -34/+31 | |
| | | | * | | | | | | | | | | | | | | | | | | Rename label to labeltext | Aaron Kennedy | 2009-10-08 | 1 | -5/+5 | |
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-10-07 | 68 | -1393/+876 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2009-10-07 | 25 | -703/+193 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-06 | 25 | -703/+193 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | Refactor tileSize to the gameCanvas item | Alan Alpert | 2009-10-07 | 2 | -13/+13 | |
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2009-10-06 | 32 | -623/+613 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | lowercase ids | Yann Bodson | 2009-10-06 | 11 | -201/+202 | |
| | | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Yann Bodson | 2009-10-06 | 1 | -2/+2 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | | | | 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 git@scm.dev.nokia.troll.no:qt/kinetic... | Michael Brasser | 2009-10-05 | 10 | -50/+50 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | 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 | |
| | | | * | | | | | | | | | | | | | | | | | | | | Improve script lookup caching | Aaron Kennedy | 2009-10-05 | 1 | -0/+3 | |
| | | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 30 | -44/+316 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 10 | -8/+25 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | * use alias in CalcButton.qml | Yann Bodson | 2009-10-01 | 2 | -6/+5 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Fix small bugs in flick-mobile | Yann Bodson | 2009-09-30 | 3 | -9/+17 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 11 | -25/+145 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Use new property name | Aaron Kennedy | 2009-09-23 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2009-09-22 | 1 | -3/+3 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Renaming: QFxView -> QmlView | Yann Bodson | 2009-09-22 | 1 | -3/+3 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Clean up Same Game JS | Alan Alpert | 2009-09-22 | 1 | -37/+12 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-15 | 7 | -3/+15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 268 | -1071/+1081 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | 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 git@scm.dev.nokia.troll.no:qt/kinetic... | Martin Jones | 2009-09-10 | 4 | -6/+6 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Update demos to work with API changes | Alan Alpert | 2009-09-10 | 4 | -6/+6 | |