summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-171-0/+2
|\
| * Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-171-0/+2
* | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-171-2/+3
|\ \ | |/ |/|
| * Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-131-2/+3
* | Remove warning. (Forgot to commit this together with my previous commits)Jan-Arve Sæther2009-11-131-1/+1
* | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-11-134-368/+182
|\ \
| * | QGAL: clean up size hint refresh codeCaio Marcelo de Oliveira Filho2009-11-122-65/+25
| * | QGAL: clean up interpolation codeCaio Marcelo de Oliveira Filho2009-11-122-95/+16
| * | QGAL: remove the caching of simplified graphCaio Marcelo de Oliveira Filho2009-11-123-72/+22
| * | QGAL: fix update size hints logic in parallel anchorsCaio Marcelo de Oliveira Filho2009-11-121-6/+13
| * | QGAL: Update code documentationEduardo M. Fleury2009-11-121-13/+26
| * | QGAL: Move size information from AnchorData to QGraphicsAnchorPrivateEduardo M. Fleury2009-11-123-108/+66
| * | QGAL: Update header documentation in QGALPrivateEduardo M. Fleury2009-11-121-9/+14
* | | Fixes QGraphicsWidget: paint() being called before polish().Bjørn Erik Nilsen2009-11-131-0/+8
| |/ |/|
* | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-113-4/+2
|\ \ | |/ |/|
| * Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-111-3/+0
| * QGraphicsTextItem: update when changing the color.Olivier Goffart2009-11-091-0/+1
| * Fix warningsThierry Bastian2009-11-091-1/+1
* | Improvements to graphics effects API after review round.Samuel Rødal2009-11-103-5/+5
|/
* Compile in 64bit with debugOlivier Goffart2009-11-091-1/+1
* Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-092-2/+2
|\
| * API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-092-2/+2
* | More inDestructor checks.Warwick Allison2009-11-091-0/+9
* | Use at() instead of operator[] for vectors and lists.Jan-Arve Sæther2009-11-071-24/+24
* | Merge branch 'cmarcelo-vertexsimplification' into 4.6Jan-Arve Sæther2009-11-072-171/+559
|\ \
| * \ Merge branch 'anchor-vertex-simplification' of git://gitorious.org/~cmarcelo/...Jan-Arve Sæther2009-11-072-171/+559
| |\ \
| | * | QGAL: avoid passing Orientation for interpolation functionsCaio Marcelo de Oliveira Filho2009-11-062-23/+16
| | * | QGAL: vertex simplificationCaio Marcelo de Oliveira Filho2009-11-062-73/+379
| | * | QGAL: allow parallel anchors simplify center anchorsCaio Marcelo de Oliveira Filho2009-11-062-16/+82
| | * | QGAL: fix leak when restoring anchorsCaio Marcelo de Oliveira Filho2009-11-061-36/+27
| | * | QGAL: Revamp the edge interpolation codeEduardo M. Fleury2009-11-062-29/+26
| | * | QGAL: Support for out-of-order parallel anchorsEduardo M. Fleury2009-11-062-10/+45
* | | | The sizePolicy property of QGraphicsWidget should be of type QSizePolicy of c...Jan-Arve Sæther2009-11-071-1/+1
|/ / /
* | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into m...Jan-Arve Sæther2009-11-062-0/+7
|\ \ \
| * | | Make sizePolicy a property of QGraphicsWidget tooArtur Duque de Souza2009-11-062-0/+7
* | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-065-2/+33
|\ \ \ \
| * | | | Fix QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-065-2/+33
| | |_|/ | |/| |
* | | | docs: Add a section about known issues for the anchor layout.Jan-Arve Sæther2009-11-061-4/+17
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-063-5/+30
|\ \ \ \
| * | | | Fix QGraphicsScene::isActive if the view is shown while the window is active.Olivier Goffart2009-11-061-0/+23
| * | | | QGraphicsView: Fixes QGraphicsView::focusItem when scene is not activeOlivier Goffart2009-11-062-5/+7
* | | | | Use 0 instead of NULL.Jan-Arve Sæther2009-11-061-6/+6
* | | | | Add documentation for the new min/pref/maxSize properties.Jan-Arve Sæther2009-11-061-0/+21
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-056-13/+128
|\ \ \ \
| * \ \ \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-056-13/+128
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-041-0/+3
| | |\ \ \
| | | * | | Doc: Fixed qdoc warnings.David Boddie2009-11-041-0/+3
| | * | | | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-045-13/+125
| | |\ \ \ \
| | | * | | | Gesture api review.Denis Dzyubenko2009-11-034-14/+12
| | | * | | | Modified gesture events propagation.Denis Dzyubenko2009-11-031-2/+11