summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0720-541/+288
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Use VisualModelYann Bodson2009-05-071-0/+274
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0718-541/+14
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Remove phonebrowser demo. Flickr is better.Aaron Kennedy2009-05-0717-537/+0
| | |
| * | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-072-4/+14
| | | | | | | | | | | | Tags in flickr demo.
* | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-072-3/+6
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-071-4/+14
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fix z handling to avoid uglynessAaron Kennedy2009-05-071-4/+14
| |/
* | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-071-1/+7
|/
* Small fix. Rotation was not set back to 0 properly.Yann Bodson2009-05-061-2/+3
|
* Add a new Flickr demo.Yann Bodson2009-05-0618-0/+464
|
* Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵Michael Brasser2009-05-0612-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 throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | Patch originally by Ian Walters.
| * Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-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 Weatherley2009-05-017-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 Weatherley2009-03-237-550/+61
| | |
* | | Remove XML custom parser supportAaron Kennedy2009-05-051-1/+1
| | |
* | | Use QML signal syntaxAaron Kennedy2009-05-013-8/+3
| | |
* | | Use QML properties syntaxAaron Kennedy2009-05-018-55/+27
| | |
* | | whitespaceWarwick Allison2009-04-301-0/+1
| | |
* | | Port syntaxWarwick Allison2009-04-302-173/+479
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3028-276/+469
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/parser/javascriptgrammar.cpp src/declarative/qml/parser/javascriptgrammar_p.h
| * | | Convert phonebrowser.Yann Bodson2009-04-307-254/+447
| | | |
| * | | Rename the mediabrowser demo to match the content.Yann Bodson2009-04-3017-0/+0
| | | |
| * | | Forgot this src attribute.Yann Bodson2009-04-291-1/+1
| | | |
| * | | Merge branch 'source' into kinetic-declarativeuiYann Bodson2009-04-298-27/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/mediabrowser/content/PhonesPathView.qml demos/declarative/mediabrowser/mediabrowser.qml
| | * | | Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore.Yann Bodson2009-04-298-28/+28
| | | | |
* | | | | Prototype custom parsers for non-xml qml languageAaron Kennedy2009-04-301-137/+99
|/ / / / | | | | | | | | | | | | ListModel has been ported (under the name ListModel2) to demonstrate. ListModel2 behaves the same as ListModel, except that list "objects" must be called "ListElement" instead of a freeform name.
* | | | API improvements for Flipable.Michael Brasser2009-04-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | You can now specify an axis and rotation, rather than using transform. The tranform behavior has been preserved, however, to allow for cases where you want a more complex transform when rotating.
* | | | model dataWarwick Allison2009-04-291-0/+137
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-297-146/+189
|\ \ \ \ | |/ / / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Convert the calculator demo.Yann Bodson2009-04-292-103/+169
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-283-8/+8
| |\ \ \ | | |/ / | | | | | | | | kinetic-declarativeui
| | * | Fixed Compile after removal of D3D.Friedemann Kleint2009-04-283-8/+8
| | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-284-32/+9
| |\ \ \ | | |/ / | | | | | | | | kinetic-declarativeui
| | * | Remove the Direct3D engine.Gunnar Sletta2009-04-243-32/+2
| | | |
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+1
| | |\ \
| | | * | Add Google Suggest as a new network exampleAriya Hidayat2009-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | Merge branch '4.5'Thiago Macieira2009-04-231-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | | * | Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-0/+5
| | |\ \ \ | | | |/ /
| | | * | Add the fancybrowser to the examples in qtdemoSimon Hausmann2009-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kavindra
| | | * | Add WebKit examples to the Qt DemoSimon Hausmann2009-04-231-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kavindra
| * | | | API and documentation work on the transform elements.Michael Brasser2009-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Axis has been split into Axis, AxisRotation, and AxisTranslation. Basic docs (in some cases just a stub) have been added for these, Perspective, and Squish. Flipable has moved to its own file.
* | | | | Nicer order.Warwick Allison2009-04-292-5/+2
| | | | | | | | | | | | | | | | | | | | Nicer order, but not perfect (no global Z)
* | | | | Phones info media, not movie info media.Warwick Allison2009-04-294-71/+47
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-2412-176/+177
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/webbrowser/WebBrowser.qml demos/declarative/webbrowser/content/pics/addressbar-filled.png demos/declarative/webbrowser/content/pics/addressbar.png demos/declarative/webbrowser/content/pics/back-disabled.png demos/declarative/webbrowser/content/pics/back.png demos/declarative/webbrowser/content/pics/footer.png demos/declarative/webbrowser/content/pics/forward-disabled.png demos/declarative/webbrowser/content/pics/forward.png demos/declarative/webbrowser/content/pics/header.png demos/declarative/webbrowser/content/pics/reload.png
| * | | | Cosmetic changes for the web browser demo.Yann Bodson2009-04-2312-176/+177
| | | | |
* | | | | Nicer icons (KDE CrystalSVG)Warwick Allison2009-04-2315-7/+1
|/ / / /
* | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-2253-550/+784
|/ / /
generated by cgit v0.12 at 2024-10-26 23:23:14 (GMT)