summaryrefslogtreecommitdiffstats
path: root/examples/graphicsview
Commit message (Collapse)AuthorAgeFilesLines
* Revert "update the padnavigator example and suppress the padnavigator-ng"Thierry Bastian2009-05-228-150/+207
| | | | | | | | This reverts commit 1cad8c56002a61a6240e6580cdbd784209821fa6. Conflicts: examples/graphicsview/padnavigator/roundrectitem.cpp
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-2210-22/+520
|\ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| | | | | | | | We introduce this new enum, we should be using it.
| * 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
| * \ 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
| * \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-073-7/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * | | | 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.
| * | | | Long live Qt!Lars Knoll2009-03-23272-0/+9535
| / / /
* | | | update the padnavigator example and suppress the padnavigator-ngThierry Bastian2009-05-208-208/+154
| |_|/ |/| |
* | | 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
* | 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
* 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
* Long live Qt 4.5!Lars Knoll2009-03-23272-0/+9535