Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change pathview angle. | Yann Bodson | 2009-05-11 | 1 | -1/+1 |
| | |||||
* | Add tags to flickr2 | Yann Bodson | 2009-05-08 | 1 | -5/+14 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-05-08 | 8 | -34/+201 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fade TagEdit properly | Warwick Allison | 2009-05-08 | 1 | -0/+1 |
| | | |||||
| * | Minimal size is MediaButton size, center outside edit mode | Warwick Allison | 2009-05-08 | 1 | -10/+8 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-08 | 8 | -102/+133 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-08 | 1 | -71/+58 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-08 | 4 | -23/+32 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Add the ability to remove whole contacts. | Ian Walters | 2009-05-08 | 4 | -29/+70 |
| | | | | | |||||
| * | | | | tag input | Warwick Allison | 2009-05-08 | 4 | -5/+132 |
| | | | | | |||||
* | | | | | Fix flickr2 | Yann Bodson | 2009-05-08 | 2 | -49/+35 |
| |_|_|/ |/| | | | |||||
* | | | | Get the delegate scale correct at the ends of the path. | Martin Jones | 2009-05-08 | 1 | -5/+4 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-08 | 3 | -3/+6 |
|\ \ \ \ | | |_|/ | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-05-07 | 1 | -1/+1 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-07 | 4 | -28/+46 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Space after tags | Warwick Allison | 2009-05-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixes for the slider. | Yann Bodson | 2009-05-07 | 3 | -2/+5 |
| | |/ / | |/| | | |||||
* | | | | More path to path fixing. | Martin Jones | 2009-05-08 | 1 | -68/+56 |
|/ / / | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 3 | -8/+20 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-07 | 1 | -2/+3 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Focus handling for 'new' dialog. | Ian Walters | 2009-05-07 | 3 | -8/+20 |
| | | | | | | | | | | | | | | | Also field value propogation (really need aliases, they don't exist yet in QML. | ||||
* | | | Get view to view transitions working properly... for PathView. | Martin Jones | 2009-05-07 | 1 | -20/+26 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-07 | 15 | -0/+780 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-07 | 4 | -4/+312 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Use KeyProxy | Ian Walters | 2009-05-07 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | Up and down keys should go to the list, text to the search bar. KeyProxy handles this by listing a set of items to attempt handling keys. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Ian Walters | 2009-05-07 | 22 | -397/+345 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Move 'final' contacts application to demos. | Ian Walters | 2009-05-07 | 15 | -0/+776 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will finish the applicaiton in this directory to fully functional. Missing features - removing contacts, clearing search, key only access Known bugs - Scroll crashes if data changes while scrolling, VerticalLayout doesn't align horizontally correctly when in ListView delegate. ListView only shows one element on startup, even though query consistently indicates 1000 items as count. | ||||
* | | | | doc | Warwick Allison | 2009-05-07 | 1 | -2/+3 |
| |_|/ |/| | | |||||
* | | | Forgot progress bar. | Martin Jones | 2009-05-07 | 1 | -0/+25 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 20 | -541/+288 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Use VisualModel | Yann Bodson | 2009-05-07 | 1 | -0/+274 |
| | |/ | |/| | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-07 | 18 | -541/+14 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Remove phonebrowser demo. Flickr is better. | Aaron Kennedy | 2009-05-07 | 17 | -537/+0 |
| | | | | |||||
| * | | | Fix QmlXmlListModel on property changes, on empty results. | Warwick Allison | 2009-05-07 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | Tags in flickr demo. | ||||
* | | | | Viewing the same image twice showed no image the second time. | Martin Jones | 2009-05-07 | 2 | -3/+6 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-07 | 1 | -4/+14 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix z handling to avoid uglyness | Aaron Kennedy | 2009-05-07 | 1 | -4/+14 |
| |/ / | |||||
* | | | Add progress reporting to Image and use it in the flickr demo. | Martin Jones | 2009-05-07 | 1 | -1/+7 |
|/ / | |||||
* | | Small fix. Rotation was not set back to 0 properly. | Yann Bodson | 2009-05-06 | 1 | -2/+3 |
| | | |||||
* | | Add a new Flickr demo. | Yann Bodson | 2009-05-06 | 18 | -0/+464 |
|/ | |||||
* | Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵ | Michael Brasser | 2009-05-06 | 12 | -735/+134 |
|\ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: demos/boxes/scene.cpp src/opengl/qglpixmapfilter.cpp src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h | ||||
| * | Port boxes demo to use math3d throughout | Rhys Weatherley | 2009-05-01 | 12 | -732/+131 |
| | | | | | | | | Patch originally by Ian Walters. | ||||
| * | Rename QGLShader(Program)::errors() to log() | Rhys Weatherley | 2009-05-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme | ||||
| * | Merge branch 'shaderprograms' of ↵ | Rhys Weatherley | 2009-05-01 | 7 | -550/+61 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api Conflicts: src/gui/math3d/math3d.pri src/gui/math3d/qgenericmatrix.cpp src/gui/math3d/qgenericmatrix.h src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h src/gui/math3d/qquaternion.cpp src/gui/math3d/qquaternion.h src/gui/math3d/qvector2d.cpp src/gui/math3d/qvector2d.h src/gui/math3d/qvector3d.cpp src/gui/math3d/qvector3d.h src/gui/math3d/qvector4d.cpp src/gui/math3d/qvector4d.h src/opengl/opengl.pro tests/auto/math3d/math3d.pro tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp tests/auto/math3d/qquaternion/tst_qquaternion.cpp tests/auto/math3d/qvectornd/tst_qvectornd.cpp tests/auto/math3d/shared/math3dincludes.h | ||||
| | * | Import shader implementation from before the history cut. | Rhys Weatherley | 2009-03-23 | 7 | -550/+61 |
| | | | |||||
* | | | Remove XML custom parser support | Aaron Kennedy | 2009-05-05 | 1 | -1/+1 |
| | | | |||||
* | | | Use QML signal syntax | Aaron Kennedy | 2009-05-01 | 3 | -8/+3 |
| | | | |||||
* | | | Use QML properties syntax | Aaron Kennedy | 2009-05-01 | 8 | -55/+27 |
| | | | |||||
* | | | whitespace | Warwick Allison | 2009-04-30 | 1 | -0/+1 |
| | | | |||||
* | | | Port syntax | Warwick Allison | 2009-04-30 | 2 | -173/+479 |
| | | |