summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-052-14/+17
|\
| * Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-09-301-12/+11
| * Fix double painting when adding an item into a linear layoutThierry Bastian2010-09-291-2/+6
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-4/+16
|\ \
| * | Add sendParentChangeNotification to QGraphicsItemMarco Bubke2010-09-302-4/+16
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-46/+83
|\ \ | |/
| * QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-222-1/+4
| * Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-221-45/+79
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-214-37/+46
|\ \ | |/
| * Fixed compile warning on Windows.Kim Motoyoshi Kalland2010-09-201-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-172-30/+29
| |\
| | * QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBo...Bjørn Erik Nilsen2010-09-162-12/+19
| | * Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-162-20/+12
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-162-1/+10
| |\ \ | | |/
| | * Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-151-2/+3
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-142-1/+9
| | |\
| | | * Completing the interface for children/data/resourcesThomas Hartmann2010-09-142-1/+9
| * | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-2/+3
| |\ \ \ | | |/ /
| | * | QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-141-2/+3
| | |/
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-1/+1
| |\ \ | | |/
| | * Assertion calledEmitUpdated fails in QGraphicsScene.Bjørn Erik Nilsen2010-09-131-1/+1
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-101-1/+1
| |\ \ | | |/
| | * Fix a regression where setPreferredSize(QSize(100, -1)) did not work.Jan-Arve Sæther2010-09-101-1/+1
| * | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-2/+2
| |\ \ | | |/
| * | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-3/+0
| |\ \
| * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-1/+1
| |\ \ \
| | * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-54/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-021-3/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Minor performance improvement to QGraphicsItem::update.Bjørn Erik Nilsen2010-09-021-3/+0
| | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-012-49/+16
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-302-49/+16
| | |\ \ | | | |/
| | | * Doc: Whitespace fixes.David Boddie2010-08-271-3/+3
| | | * doc: Fixed numerous qdoc warnings.Martin Smith2010-08-272-52/+19
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-273-15/+11
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-242-2/+6
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-177-23/+332
| |\ \ \ \
| * | | | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
* | | | | | Enable the width-for-height codepath and add autotest for WFH.Jan-Arve Sæther2010-09-021-5/+0
* | | | | | Use hasHeightForWidth() and hasWidthForHeight() instead of sizePolicy()Jan-Arve Sæther2010-09-021-14/+24
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-303-15/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Make sure propagated font in QGraphicsWidget can be set on a QPainterEskil Abrahamsen Blomfeldt2010-08-272-1/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-271-7/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.Bjørn Erik Nilsen2010-08-251-7/+3
| | | |_|/ | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-251-7/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed touch event delivery in QGraphicsView.Denis Dzyubenko2010-08-231-7/+2
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-252-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ...Olivier Goffart2010-08-241-1/+3
| |/ / /
| * | | QGraphicsView: fix few artefacts that can appear if the changed() signal is c...Olivier Goffart2010-08-201-1/+3
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1311-29/+426
|\ \ \ | |/ /