Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add mass property to follow. | Martin Jones | 2009-07-29 | 1 | -2/+10 |
| | |||||
* | loader improvements. | Martin Jones | 2009-07-29 | 2 | -1/+118 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-23 | 140 | -29/+269 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Doc and example fixes for library qualification (QT-558) | Warwick Allison | 2009-07-23 | 20 | -29/+29 |
| | | |||||
| * | Move all QML types to Qt/4.6 namespace. | Warwick Allison | 2009-07-23 | 120 | -0/+240 |
| | | | | | | | | | | Adjust examples and demos accordingly. As per QT-558 | ||||
* | | make scrollbars look nice again. | Yann Bodson | 2009-07-23 | 1 | -7/+7 |
|/ | |||||
* | Move the Script interface of QmlComponent to QmlBindableComponent | Alan Alpert | 2009-07-21 | 1 | -2/+2 |
| | |||||
* | Allow minehunt example to compile again. | Alan Alpert | 2009-07-20 | 1 | -1/+0 |
| | | | | qmlbindablevalue had been renamed and no-one updated this file. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-20 | 8 | -25/+37 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-20 | 11 | -21/+174 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Make identical to non-simple example. | Warwick Allison | 2009-07-20 | 1 | -4/+13 |
| | | | |||||
| | * | Update in light of new Image.preserveAspect property | Warwick Allison | 2009-07-20 | 6 | -21/+10 |
| | | | |||||
| * | | Fixup minehunt example with the new style particle explosions | Alan Alpert | 2009-07-20 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | Note that there seems to be a bug still with when the RunScriptAction is called. | ||||
* | | | Add an inSync property that holds whether the target has "caught up" | Martin Jones | 2009-07-20 | 2 | -6/+20 |
| |/ |/| | | | | | Useful for determining when the target has finished animating. | ||||
* | | Remove unnecessary stuff from the example | Aaron Kennedy | 2009-07-17 | 3 | -15/+0 |
| | | |||||
* | | Add non-threadsafe QGuard class | Aaron Kennedy | 2009-07-17 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-17 | 4 | -14/+29 |
|\ \ | |/ | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximage.h | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-17 | 3 | -13/+29 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Compile, tidy up code. | Warwick Allison | 2009-07-17 | 3 | -13/+29 |
| | | | |||||
| * | | Remove non-functioning opaque property. | Michael Brasser | 2009-07-17 | 1 | -1/+0 |
| |/ | |||||
* | | "snow" demo | Aaron Kennedy | 2009-07-17 | 4 | -0/+170 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-16 | 5 | -17/+49 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/fx/fx.pri | ||||
| * | Improve loader example | Yann Bodson | 2009-07-16 | 5 | -17/+49 |
| | | | | | | | | Use system palette and icons. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-15 | 15 | -0/+72 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvasdebugplugin.cpp src/declarative/canvas/qsimplecanvasdebugplugin_p.h src/declarative/fx/qfxpainteditem.cpp src/declarative/util/qfxview.cpp tools/qmlviewer/qmlviewer.h | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-14 | 14 | -0/+58 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Libraries and library versioning. | Warwick Allison | 2009-07-14 | 14 | -0/+58 |
| | | | |||||
| * | | Move QmlTimer to util/ | Martin Jones | 2009-07-14 | 1 | -0/+14 |
| |/ | |||||
* | | Fix containsMouse. | Michael Brasser | 2009-07-14 | 1 | -4/+2 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-09 | 7 | -6/+119 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-08 | 47 | -7/+1236 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Add a modulus property to Follow to allow "wrapping". | Martin Jones | 2009-07-08 | 6 | -0/+83 |
| | | | | | | | | | | | | Also add clock example to demonstrate. | ||||
| * | | Browser UI improvements. | Martin Jones | 2009-07-08 | 1 | -6/+36 |
| | | | |||||
* | | | Doc | Aaron Kennedy | 2009-07-07 | 34 | -0/+1418 |
| |/ |/| | |||||
* | | Improve QmlComponent API | Aaron Kennedy | 2009-07-07 | 6 | -6/+6 |
| | | | | | | | | Having to use QUrl::fromLocalFile() is crummy. Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-06 | 3 | -7/+10 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Fix bug in createQmlObject | Alan Alpert | 2009-07-06 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | Wasn't actually loading the object's context properly, with regard to url resolution. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-02 | 2 | -4/+57 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Improve JS dynamic creation | Alan Alpert | 2009-07-02 | 2 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Renamed evalQml to be consistent with us, not javascript. Fixed bug where createComponent never had the right path. createQmlObject (evalQml) now has a parent as a argument. It also still has a bug where that parent doesnt get set properly, although it is used as the creation context also. | ||||
* | | | Doc | Aaron Kennedy | 2009-07-06 | 44 | -0/+1226 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-02 | 11 | -34/+52 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-02 | 9 | -9/+9 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Add parameterized synthesized signals | Aaron Kennedy | 2009-07-02 | 9 | -9/+9 |
| | | | | | | | | | | | | Also changed syntax for emitting a signal to be consistent with normal QtScript. | ||||
| * | | Beautification of dynamic object example. | Alan Alpert | 2009-07-02 | 2 | -25/+43 |
| |/ | | | | | | | | | Adds some error handling, and cleans up documentation and the example a little. | ||||
* | | Make loader handle dummy data and get source URL right. | Martin Jones | 2009-07-02 | 2 | -4/+57 |
|/ | |||||
* | Replace browser with loaded QML. | Martin Jones | 2009-06-30 | 3 | -37/+44 |
| | |||||
* | Simple QML browser/loader. | Martin Jones | 2009-06-30 | 4 | -0/+73 |
| | |||||
* | Rename notifiers: topChanged -> yChanged; leftChanged -> xChanged. | Michael Brasser | 2009-06-30 | 1 | -1/+1 |
| | |||||
* | Cleanup, fixes, and basic docs for XmlListModel. | Michael Brasser | 2009-06-29 | 3 | -19/+19 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-06-26 | 37 | -64/+86 |
|\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/states/states.qml examples/declarative/states/transitions.qml examples/declarative/tutorials/helloworld/t3/tutorial3.qml src/declarative/util/qmlanimation.cpp | ||||
| * | Color property is required to be explicity set (at least for now). | Michael Brasser | 2009-06-26 | 7 | -2/+9 |
| | |