summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: Compilation fixesDenis Dzyubenko2009-05-111-0/+2
|
* Fixed lastDirection in the Pan gesture.Denis Dzyubenko2009-05-111-1/+1
|
* Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-117-0/+724
| | | | | This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
* build the multitouch examples from the top-level buildBradley T. Hughes2009-05-081-1/+2
| | | | just needed to add multitouch to SUBDIRS in examples/examples.pro
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-081-1/+1
|\ | | | | | | windows-7-multitouch
| * Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | * Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-044-6/+30
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-294-6/+30
| |\ \ | | |/
| | * Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| | * 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-271-1/+1
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-2319-1/+1340
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-232-6/+14
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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 '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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-203-6/+6
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-167-23/+69
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-078-13/+514
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-03-3011-2/+719
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | 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>