summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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
| * | 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
| | |
* | | Converted the examples.Roberto Raggi2009-04-2723-655/+1503
| |/ |/|
* | Update tile images for minehunt example.Michael Brasser2009-04-277-12/+2
| |
* | Tweak the Dial example.Michael Brasser2009-04-262-4/+4
|/
* 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
|\ \
| * \ Merge branch '4.5'Rhys Weatherley2009-04-211-3/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | BT: Fix lock-up & crash in the Elastic Nodes exampleAndreas Aardal Hanssen2009-04-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao
| * | | Merge branch '4.5'Thiago Macieira2009-04-201-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * | Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| | |/ | | | | | | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-22347-303/+19326
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-173-6/+6
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Use setContentsMargins() instead of setMargin().Jan-Arve Sæther2009-04-161-2/+2
| | | | | | | | setMargin() is deprecated.
| * Doc - Changed the link provided in the README file to one that does notKavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | | | | | | | | have a version number, so we do not have to update it each release. Task-number: 251352 Reviewed-by: TrustMe
| * Doc - Some minor cleanups in the documentation of QInputDialog. AlsoKavindra Devi Palaraja2009-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | marked getInt() as since Qt 4.5 and finally modified the StandardDialogs example to reflect the fact that getInteger() is deprecated. Task-number: 251288 Reviewed-by: nrc <qt-info@nokia.com> BT: Yes
| * Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| |
* | Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| |
* | Changed codeeditor include to use double quotes, was failing to compile ↵Kurt Korbatits2009-04-151-1/+1
| | | | | | | | | | | | uncer windows. Reviewed-by: Justin McPherson
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-074-8/+10
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * BT: Adjust the colliding mice example to work with coalesced updates.Norwegian Rock Cat2009-04-063-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that Cocoa is much more strict about coalesced updates than Carbon ever was. The upshot of this is that some examples that "worked" after a fashion in Carbon, do not exhibit good frame rates with Cocoa. The reason why is that apparently Cocoa will decide to flush to the screen every time a timer fires. If you have a lot of timers that are all dependent on doing on update to the screen, you will get undesirable effects. Thankfully, it is possible to adjust the examples to follow best practices and get a good result. So, we now only do the animation once using QGraphicsScene::advance(). We are also able to make the mice less heavy (no QObject subclass). I've updated the docs and someone on the doc team has kindly volunteered to go through them. Reviewed-by: Andreas
| * Install the animation.mng file.Thiago Macieira2009-04-061-1/+1
| | | | | | | | | | | | | | | | Otherwise, for people who install Qt (everyone outside Nokia), the animation file isn't present. Reviewed-by: Trust Me BT: yes