summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-211-0/+6
|\
| * Make QGraphicsItem::effectiveBoundingRect/sceneEffectiveBoundingRect internal.Bjørn Erik Nilsen2009-08-201-2/+0
| * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-191-3/+6
| |\
| * \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171-1/+1
| |\ \
| * \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-071-26/+31
| |\ \ \
| * \ \ \ Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Bjørn Erik Nilsen2009-07-291-0/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Rhys Weatherley2009-07-241-4/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-231-0/+3
| | |\ \ \ \ \
| * | | | | | | Add QGraphicsSourceEffect.Bjørn Erik Nilsen2009-07-291-0/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Make QGraphicsEffect independent of QGraphicsItem.Bjørn Erik Nilsen2009-07-241-2/+0
| * | | | | | QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-07-231-2/+2
| |/ / / / /
| * | | | | Merge commit 'qt/master' into graphicseffectsBjørn Erik Nilsen2009-07-211-30/+34
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'master/master' into kinetic-graphicseffectAriya Hidayat2009-06-291-4/+53
| |\ \ \ \ \ \
| * | | | | | | Another n-th attempt at making an API for the effect framework.Ariya Hidayat2009-06-021-0/+9
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | add QGraphicsObject Q_INTERFACES macroThierry Bastian2009-08-181-0/+1
* | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-181-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge QGV delta from kinetic-declarativeui into master.Andreas Aardal Hanssen2009-08-171-3/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-061-10/+10
* | | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added input hints to QGraphicsItem.jasplin2009-08-041-0/+3
* | | | | | Merge commit 'origin/master'Jason Barron2009-08-041-10/+10
|\ \ \ \ \ \
| * | | | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-10/+10
* | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-25/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Disambiguate QGraphicsObject::children().Andreas Aardal Hanssen2009-07-291-0/+7
| * | | | | | Implement new transformation handling for graphics items.Lars Knoll2009-07-291-25/+17
* | | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-281-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add QGraphicsItem::ItemAutoDetectsFocusProxy and improve subfocus support.Andreas Aardal Hanssen2009-07-271-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-30/+37
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Add QGraphicsItem::focusProxy(), focus proxy support.Andreas Aardal Hanssen2009-07-231-0/+3
| | |_|/ | |/| |
| * | | Add QGraphicsView::filtersChildEvents property.Marius Bugge Monsen2009-07-141-0/+3
| * | | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-101-6/+2
| |\ \ \
| | * | | Improved the support for input methods in Graphics View.jasplin2009-07-031-1/+2
| | * | | Refactored gesture apiDenis Dzyubenko2009-07-021-5/+0
| | | |/ | | |/|
| * | | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-011-0/+7
| |\ \ \ | | |/ /
| * | | Graphics View: BSP tree cleanup.Bjørn Erik Nilsen2009-06-291-0/+1
| * | | API / code review for QGraphicsSceneIndex (internal API).Andreas Aardal Hanssen2009-06-171-24/+24
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-171-2/+2
| |\ \ \
| * | | | Fix all documentation warnings.Alexis Menard2009-06-161-2/+0
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-161-1/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-111-1/+3
| |\ \ \ \ \
| * | | | | | Remove the sorting cache from the QGraphicsScene and move it to the BSP.Alexis Menard2009-06-031-0/+1
| * | | | | | First bunch of changes after an very first API reviewAlexis Menard2009-05-291-0/+4
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-05-291-7/+38
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Remove the indexing (BSP) logic from the sceneAlexis Menard2009-04-071-0/+1
* | | | | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-171-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |