summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-108-234/+449
|\
| * Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.Bjørn Erik Nilsen2009-12-081-0/+2
| * Remove id property from QGraphicsObjectAlan Alpert2009-12-082-8/+0
| * Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or QW...Yoann Lopes2009-12-072-17/+7
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-041-1/+1
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-043-5/+4
| |\ \
| | * | Fixes clipping bug in the embedded dialogs demo.Yoann Lopes2009-12-041-1/+0
| | * | Fix crash when QGraphicsItem destructor deletes other QGraphicsItemOlivier Goffart2009-12-041-2/+2
| * | | Merge branch 'fleury-ooo-sequential' into 4.6Jan-Arve Sæther2009-12-044-206/+438
| |\ \ \
| | * | | Made sure that we didn't reference dangling parallel anchors.Jan-Arve Sæther2009-12-041-2/+2
| | * | | Rename the global limit to g_offset.Jan-Arve Sæther2009-12-031-13/+13
| | * | | Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbo...Jan-Arve Sæther2009-12-014-206/+438
| | |\ \ \
| | | * | | QGAL: Remove deprecated assert clausesEduardo M. Fleury2009-11-271-16/+0
| | | * | | QGAL: Refactor solvePreferred to support min/maxPrefSizeEduardo M. Fleury2009-11-271-24/+69
| | | * | | QGAL: Add AnchorData::minPrefSize and maxPrefSizeEduardo M. Fleury2009-11-273-46/+149
| | | * | | QGAL: parallel anchors sometimes have to fix constraintsCaio Marcelo de Oliveira Filho2009-11-271-16/+35
| | | * | | QGAL: move second child direction check to a functionCaio Marcelo de Oliveira Filho2009-11-272-12/+24
| | | * | | QGAL: Use single arrow in "dumpGraph"Eduardo M. Fleury2009-11-271-1/+1
| | | * | | QGAL: Enable out-of-order sequential simplificationEduardo M. Fleury2009-11-271-46/+23
| | | * | | QGAL: Support for out-of-order sequential anchorsEduardo M. Fleury2009-11-271-6/+34
| | | * | | QGAL: Do not revert negative anchorsJesus Sanchez-Palencia2009-11-272-23/+4
| | | * | | QGAL: Limit absolute size of anchors and add offset to calculationEduardo M. Fleury2009-11-272-12/+57
| | | * | | QGAL: Rename internalSizeHints to applySizePolicyEduardo M. Fleury2009-11-271-10/+15
| | | * | | QGAL: Fix memory management issues (leak + invalid read)Eduardo M. Fleury2009-11-272-6/+27
| | | * | | QGAL: Prevent internal anchors from being exposed by QGAL::anchor()Eduardo M. Fleury2009-11-271-2/+14
| | | * | | QGAL: default spacing can be unset using a negative valueEduardo M. Fleury2009-11-271-21/+2
* | | | | | Fix crash.Michael Brasser2009-12-081-0/+1
* | | | | | Fix crash.Michael Brasser2009-12-081-1/+1
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-25/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Some doc fixesJan-Arve Sæther2009-12-031-2/+2
| | |/ / /
| * | | | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-031-1/+1
| |/ / /
| * | | Only call updateFont if the font have changed.Alexis Menard2009-11-301-1/+2
| |/ /
| * | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-271-3/+3
| |\ \
| * \ \ Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-271-21/+2
| |\ \ \
| | * | | QGAL: default spacing can be unset using a negative valueEduardo M. Fleury2009-11-251-21/+2
| | * | | QGAL: sizeHint constraints needed by anchors parallel with the layoutEduardo M. Fleury2009-11-251-6/+14
| | * | | QGAL: deal correctly with anchors in parallel with the layoutCaio Marcelo de Oliveira Filho2009-11-252-6/+4
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-305-226/+32
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-275-226/+32
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of itemsAlexis Menard2009-11-261-1/+2
| | * | QGraphicsTextItem::setDefaultTextColor check change before calling update()Olivier Goffart2009-11-261-1/+3
| | * | Remove unused variables in QGraphicsItem and QGraphicsScene.Bjørn Erik Nilsen2009-11-254-34/+20
| | * | Remove caching of QGraphicsItem::clipPath().Bjørn Erik Nilsen2009-11-253-191/+8
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-277-26/+41
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-253-12/+25
| |\ \ \ | | |/ /
| | * | Mac: Fixes painting artifacts in Graphics ViewBjørn Erik Nilsen2009-11-241-0/+7
| | * | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-232-12/+18
| | |\ \ | | | |/ | | |/|
| | | * QGAL: sizeHint constraints needed by anchors parallel with the layoutEduardo M. Fleury2009-11-201-6/+14
| | | * QGAL: deal correctly with anchors in parallel with the layoutCaio Marcelo de Oliveira Filho2009-11-202-6/+4