Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge commit 'qt/master' into graphicssceneindex | Bjørn Erik Nilsen | 2009-07-01 | 1 | -0/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Compiler warnings. | Bjørn Erik Nilsen | 2009-07-01 | 1 | -0/+2 | |
| * | | | Merge commit 'qt/master' into graphicssceneindex | Bjørn Erik Nilsen | 2009-07-01 | 1 | -0/+147 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Proper handling of scene rect in QGraphicsScene(Index). | Bjørn Erik Nilsen | 2009-06-26 | 1 | -0/+1 | |
| * | | | Merge commit 'qt/master' into graphicssceneindex | Bjørn Erik Nilsen | 2009-06-23 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-06-18 | 1 | -8/+6 | |
| |\ \ \ \ | ||||||
| * | | | | | Changes after first round of code reviewing. | Andreas Aardal Hanssen | 2009-06-18 | 1 | -17/+16 | |
| * | | | | | Make eveything internal for now but ready to see the light. | Alexis Menard | 2009-06-17 | 1 | -1/+1 | |
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-06-17 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-06-16 | 1 | -41/+312 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-06-11 | 1 | -648/+510 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove the sorting cache from the QGraphicsScene and move it to the BSP. | Alexis Menard | 2009-06-03 | 1 | -12/+10 | |
| * | | | | | | | | First bunch of changes after an very first API review | Alexis Menard | 2009-05-29 | 1 | -14/+3 | |
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-05-29 | 1 | -72/+602 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraph... | Alexis Menard | 2009-05-05 | 1 | -30/+71 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove the indexing (BSP) logic from the scene | Alexis Menard | 2009-04-07 | 1 | -7/+3 | |
* | | | | | | | | | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 1 | -12/+157 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-22 | 1 | -10/+8 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Small optimization to QGraphicsItemPrivate::combineTransform(To|From)Parent. | Bjørn Erik Nilsen | 2009-06-19 | 1 | -2/+2 | |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Use QTransform more efficiently. | Bjørn Erik Nilsen | 2009-06-18 | 1 | -8/+6 | |
| | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-17 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 | |
| | | * | | | | | QGraphicsItem::setOpacity(0.0) does not trigger an update of child items | Leonardo Sobral Cunha | 2009-06-12 | 1 | -1/+1 | |
| * | | | | | | | Merge of master | Bradley T. Hughes | 2009-06-15 | 1 | -56/+87 | |
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-12 | 1 | -5/+245 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | enable touch events on all views if an item has touch enabled | Bradley T. Hughes | 2009-06-11 | 1 | -0/+6 | |
| * | | | | | | | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent) | Bradley T. Hughes | 2009-06-11 | 1 | -3/+2 | |
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-10 | 1 | -647/+505 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-29 | 1 | -39/+141 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-26 | 1 | -41/+401 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Moved gestures info to an extra in QGraphicsItemPrivate not to increase the s... | Denis Dzyubenko | 2009-05-20 | 1 | -13/+20 | |
| * | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouch | Bradley T. Hughes | 2009-05-18 | 1 | -7/+37 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | implemented gestures support in graphicsview for QGraphicsItems and | Denis Dzyubenko | 2009-05-18 | 1 | -7/+37 | |
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-18 | 1 | -12/+70 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Added missing \since 4.6 doc tag | Denis Dzyubenko | 2009-05-11 | 1 | -0/+8 | |
| * | | | | | | | | | | Removed all weird qHash usage for gesture identification. | Denis Dzyubenko | 2009-05-11 | 1 | -5/+4 | |
| * | | | | | | | | | | More documentation fixes. | Denis Dzyubenko | 2009-05-11 | 1 | -7/+41 | |
| * | | | | | | | | | | Modifications after the api review by Brad. | Denis Dzyubenko | 2009-05-11 | 1 | -13/+19 | |
| * | | | | | | | | | | Fixes: improved gesture manager event filtering. | Denis Dzyubenko | 2009-05-11 | 1 | -0/+5 | |
| * | | | | | | | | | | Merge of the maemo-gestures branch onto qt/4.5.0 | Denis Dzyubenko | 2009-05-11 | 1 | -0/+28 | |
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-05-08 | 1 | -19/+29 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-04-23 | 1 | -7/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-04-23 | 1 | -1/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-04-16 | 1 | -178/+402 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-04-07 | 1 | -8/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-mult... | Bradley T. Hughes | 2009-03-30 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | add QGraphicsItem::acceptTouchEvents() and setAcceptTouchEvents() | Bradley T. Hughes | 2009-03-24 | 1 | -0/+25 | |
* | | | | | | | | | | | | | | | | Manually fix bad merges and make sure everything compiles with 4.6. | Harald Fernengel | 2009-06-29 | 1 | -3/+2 | |
* | | | | | | | | | | | | | | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 1 | -619/+1417 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |