summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'source' into kinetic-declarativeuiYann Bodson2009-04-2936-72/+72
|\ | | | | | | | | | | 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-2936-72/+72
| |
* | API improvements for Flipable.Michael Brasser2009-04-291-6/+6
| | | | | | | | | | | | 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.
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-2947-682/+2801
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2821-5/+1347
| |\ | | | | | | | | | kinetic-declarativeui
| | * fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-237-0/+498
| | |\
| | | * Add Google Suggest as a new network exampleAriya Hidayat2009-04-237-0/+498
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | Merge branch '4.5'Thiago Macieira2009-04-236-1/+512
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | | * Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-236-1/+512
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-237-1/+331
| | |\ \ | | | |/
| | | * Add fancy browser as the new exampleAriya Hidayat2009-04-237-1/+331
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-3/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | | * Fix more NaNs in Elastic Nodes exampleJoão Abecasis2009-04-221-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to draw zero-length lines. Don't draw lines if nodes are superimposed. Reviewed-by: Andreas
| * | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵Aaron Kennedy2009-04-281-185/+72
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/minehunt/minehunt.qml
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-283-10/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | 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.
| * | | | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵Aaron Kennedy2009-04-281-48/+24
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/mouseregion/mouse.qml
| | * | | | More mouse and key event handling and related documentationMartin Jones2009-04-281-1/+1
| | | | | |
| * | | | | Converted connections, listview and mouse.Roberto Raggi2009-04-273-114/+180
| | | | | |
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Roberto Raggi2009-04-273-10/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx
| * | | | | Converted the examples.Roberto Raggi2009-04-2723-655/+1503
| | |/ / / | |/| | |
* | | | | Enable pluginsWarwick Allison2009-04-291-1/+1
| |/ / / |/| | | | | | | | | | | They're no longer on by default, as per QWebPage.
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-279-16/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxitem.cpp
| * | | Update tile images for minehunt example.Michael Brasser2009-04-277-12/+2
| | | |
| * | | Tweak the Dial example.Michael Brasser2009-04-262-4/+4
| | | |
* | | | Make MouseRegion signals pass a mouse event as their parameter.Martin Jones2009-04-272-9/+9
| | | |
* | | | Fix the highlight positioning.Martin Jones2009-04-271-1/+1
|/ / /
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-2364-429/+2256
|\ \ \ | | | | | | | | | | | | into kinetic-declarativeui
| * | | Moved the animation examples piemenu and photobrowser to examples/researchLeonardo Sobral Cunha2009-04-2316-0/+0
| | | |
| * | | Update copyright headers of animation examplesLeonardo Sobral Cunha2009-04-2354-110/+1937
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-231-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Simplify dial example.Aaron Kennedy2009-04-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | As Item::rotation is a subscribable property, the second (identical) Follow is unnecessary.
* | | | | Adding 'presentation' qml to tutorial steps.Ian Walters2009-04-2318-109/+181
| | | | | | | | | | | | | | | | | | | | | | | | | Also changed background from black to white so to better match screenshots within documentation.
* | | | | First draft chapter 1 of tutorial: complete.Ian Walters2009-04-231-21/+13
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-238-22/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Allow method text of recipe example to scrollMartin Jones2009-04-233-16/+18
| | | | |
| * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-225-6/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| | * | | Fixes for solution package.Jan-Arve Sæther2009-04-225-6/+10
| | | | |
* | | | | Continuing tutorialIan Walters2009-04-2315-432/+507
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start of qdoc componenet relating to example files. Also removed t8 and replaced with Final, which will represent the final 'application', and not necissarily in terms of minor stages. However difference that will be useful or confusing to the user will still be highlighted, just not in the progressive manor of the rest of the tutorial Scheduled for review when complete.
* | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-2252-326/+1151
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | include the right headerKent Hansen2009-04-212-2/+2
| | | |
| * | | compile fixThierry Bastian2009-04-201-1/+1
| | | |
| * | | cleanup in demoThierry Bastian2009-04-204-95/+30
| | | | | | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers
| * | | iterationCount becomes loopCount againThierry Bastian2009-04-203-6/+5
| | | |
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-1740-38/+2096
| |\ \ \
| | * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1740-38/+2096
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-172095-0/+154496
| | / / / | | | | | | | | | | | | | | | repository to the new repository
| * | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-172102-0/+155387
| / / /
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-222-4/+9
|\ \ \ \ | | |/ / | |/| |