summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.cpp
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-011-0/+2
| |\ \ \ | | |/ /
| | * | Compiler warnings.Bjørn Erik Nilsen2009-07-011-0/+2
| * | | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-07-011-0/+147
| |\ \ \ | | |/ /
| * | | Proper handling of scene rect in QGraphicsScene(Index).Bjørn Erik Nilsen2009-06-261-0/+1
| * | | Merge commit 'qt/master' into graphicssceneindexBjørn Erik Nilsen2009-06-231-2/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-181-8/+6
| |\ \ \ \
| * | | | | Changes after first round of code reviewing.Andreas Aardal Hanssen2009-06-181-17/+16
| * | | | | Make eveything internal for now but ready to see the light.Alexis Menard2009-06-171-1/+1
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-171-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-161-41/+312
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-06-111-648/+510
| |\ \ \ \ \ \ \
| * | | | | | | | Remove the sorting cache from the QGraphicsScene and move it to the BSP.Alexis Menard2009-06-031-12/+10
| * | | | | | | | First bunch of changes after an very first API reviewAlexis Menard2009-05-291-14/+3
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-05-291-72/+602
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph...Alexis Menard2009-05-051-30/+71
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove the indexing (BSP) logic from the sceneAlexis Menard2009-04-071-7/+3
* | | | | | | | | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-12/+157
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-221-10/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Small optimization to QGraphicsItemPrivate::combineTransform(To|From)Parent.Bjørn Erik Nilsen2009-06-191-2/+2
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-8/+6
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | 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
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | * | | | | QGraphicsItem::setOpacity(0.0) does not trigger an update of child itemsLeonardo Sobral Cunha2009-06-121-1/+1
| * | | | | | | Merge of masterBradley T. Hughes2009-06-151-56/+87
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-121-5/+245
| |\ \ \ \ \ \ \
| * | | | | | | | enable touch events on all views if an item has touch enabledBradley T. Hughes2009-06-111-0/+6
| * | | | | | | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)Bradley T. Hughes2009-06-111-3/+2
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-101-647/+505
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-291-39/+141
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-261-41/+401
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Moved gestures info to an extra in QGraphicsItemPrivate not to increase the s...Denis Dzyubenko2009-05-201-13/+20
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-05-181-7/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | implemented gestures support in graphicsview for QGraphicsItems andDenis Dzyubenko2009-05-181-7/+37
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-181-12/+70
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Added missing \since 4.6 doc tagDenis Dzyubenko2009-05-111-0/+8
| * | | | | | | | | | Removed all weird qHash usage for gesture identification.Denis Dzyubenko2009-05-111-5/+4
| * | | | | | | | | | More documentation fixes.Denis Dzyubenko2009-05-111-7/+41
| * | | | | | | | | | Modifications after the api review by Brad.Denis Dzyubenko2009-05-111-13/+19
| * | | | | | | | | | Fixes: improved gesture manager event filtering.Denis Dzyubenko2009-05-111-0/+5
| * | | | | | | | | | Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-111-0/+28
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-05-081-19/+29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-231-7/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-231-1/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-161-178/+402
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-04-071-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult...Bradley T. Hughes2009-03-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add QGraphicsItem::acceptTouchEvents() and setAcceptTouchEvents()Bradley T. Hughes2009-03-241-0/+25
* | | | | | | | | | | | | | | | Manually fix bad merges and make sure everything compiles with 4.6.Harald Fernengel2009-06-291-3/+2
* | | | | | | | | | | | | | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-619/+1417
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |