summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix a small bugs in the example. +two small cleanups.Jan-Arve Sæther2009-04-063-5/+7
| |
* | Add missing license headers.Jan-Arve Sæther2009-04-065-4/+209
| |
* | Improve example so that we can demonstrate custom layout items.Jan-Arve Sæther2009-03-312-13/+49
| | | | | | | | Should show better how to reimplement setGeometry(), sizeHint()
* | Add an example of how to write a custom layout for QGraphicsLayouts.Jan-Arve Sæther2009-03-316-0/+258
| | | | | | | | Flowlayout... Documentation will follow.
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-2610-1/+718
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-261-0/+5
| | | | | | | | | | | | | | | | | | | | commit e67776ff836b1e761dd1db1945daddc6394b6a54 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:47:42 2009 +0100 Doc: Added missing file. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-03-261-1/+1
| |\
| * | Squashed commit of the following:David Boddie2009-03-268-0/+712
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8af45bfd7efe647963bcedf1736b62ee8568590d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:39:31 2009 +0100 Doc: Committed a stray change. Reviewed-by: David Boddie commit 2aa564839e6a4821e9419230a1dd13ef691c679d Merge: f9e590a... db3c3ca... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:38:53 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit f9e590a4ef3e134cf2a1606a6fe3307df6935e96 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:37:02 2009 +0100 Doc: Simplified the SVG Generator example and updated the list of examples. Committing before merging into the 4.5 branch. Reviewed-by: David Boddie <dboddie@trolltech.com> commit ba35080c7d728b9e47ac68e74fe62877285c400f Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 14:29:13 2009 +0100 Doc: Added a SVG generator example. This example shows how to paint on an QSvgGenerator device. Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-261-1/+1
|\ \ \ | | |/ | |/|
| * | Make the traffic info example not hit the server every minute.Thiago Macieira2009-03-261-1/+1
| |/ | | | | | | | | | | | | | | The most frequent service in Oslo is every 5 minutes, so this should be a reasonable update interval. Let's hope that Trafikanten will stop blocking us in their firewall now. Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-231907-0/+142207
|
* Long live Qt!Lars Knoll2009-03-231907-0/+142213