summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-8/+33
|\ \ | |/
| * Further focus scope fixes.Michael Brasser2010-10-191-7/+12
| * Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
| * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-141-0/+16
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-132-7/+11
| | |\
| | * | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-134-37/+274
| |\ \ \ | | |_|/ | |/| |
* | | | Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-253-201/+133
|\ \ \ \ | | |/ / | |/| |
| * | | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-132-10/+11
| * | | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-132-191/+122
| * | | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-134-13/+318
| | |/ | |/|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-213-8/+11
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-193-8/+11
| |\ \ \
| | * | | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-193-8/+11
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-191-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2010-10-181-2/+2
| |/ / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-7/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-112-7/+11
| |/
* | Experimental support of the unified toolbar withFabien Freling2010-10-081-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-082-19/+59
|\ \ | |/
| * Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
| * QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-061-18/+58
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-052-4/+6
|\ \ | |/
| * Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-041-1/+1
| * FocusOut even when QGraphicsItem gets hidden.Frederik Gladhorn2010-10-011-3/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-015-332/+30
| |\
| | * Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-304-318/+13
* | | 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