summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Remove "to" limit on minor version.Warwick Allison2009-11-051-0/+3
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-049-25/+54
|\
| * Merge commit 'origin/4.6' into featureJørgen Lind2009-11-0213-239/+546
| |\
| | * Track declarative changesWarwick Allison2009-11-021-1/+1
| | * Merge commit 'widget/4.6' into origin/4.6Olivier Goffart2009-10-3012-230/+512
| | |\
| | | * Merge branch 'fixes' of git://gitorious.org/~cmarcelo/qt/cmarcelos-clone into...Jan-Arve Sæther2009-10-292-13/+8
| | | |\
| | | | * QGAL: set the orientation bit for complex anchorsCaio Marcelo de Oliveira Filho2009-10-282-13/+8
| | | * | Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-294-9/+29
| | | |\ \
| | * | | | Added some optimizations to the blur and drop shadow GL filters.Samuel Rødal2009-10-291-1/+2
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-284-8/+9
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-271-2/+21
| | |\ \ \ \
| | * | | | | Options on how to get a pixmap from an effect sourceGunnar Sletta2009-10-272-8/+32
| * | | | | | Fix SCROLLAREA by fixing missing QT_NO_GRAPHICSVIEW dependenciesJørgen Lind2009-10-296-5/+12
| * | | | | | Fix LIBRARY and ICONJørgen Lind2009-10-292-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-1/+1
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet...Aaron Kennedy2009-10-2912-217/+504
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Compile on 64bitOlivier Goffart2009-10-281-2/+2
| * | | | | Fix initial focus bug in ItemIsFocusScope.Andreas Aardal Hanssen2009-10-281-7/+32
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-281-0/+2
| |\ \ \ \ \
| | * | | | | Let QGraphicsItem set QObjectPrivate::wasDeleted when appropriate.Andreas Aardal Hanssen2009-10-281-0/+2
| * | | | | | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone...Jan-Arve Sæther2009-10-2812-215/+756
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | QGAL (QSimplex): Add constraints simplificationEduardo M. Fleury2009-10-262-4/+99
| | * | | | QGAL (QSimplex): Make deep copy of constraints inside QSimplexEduardo M. Fleury2009-10-263-12/+13
| | * | | | QGAL: Add QSimplexConstraint::toString() method for debuggingEduardo M. Fleury2009-10-261-0/+23
| | * | | | QGAL: Use constraints of type "equal" for fixed itemsEduardo M. Fleury2009-10-261-12/+22
| | * | | | QGAL: clarify the usage of isLayoutAnchor bitCaio Marcelo de Oliveira Filho2009-10-262-11/+4
| | * | | | QGAL: add orientation bit to the anchorCaio Marcelo de Oliveira Filho2009-10-262-9/+11
| | * | | | QGAL: simplification doesn't depend on vertex anchor point informationCaio Marcelo de Oliveira Filho2009-10-261-4/+4
| | * | | | QGAL: store item and center-ness information in the anchorCaio Marcelo de Oliveira Filho2009-10-262-14/+19
| | * | | | QGAL: identify unfeasible setups even when graph is simplifiedCaio Marcelo de Oliveira Filho2009-10-262-34/+71
| | * | | | QGAL: separate parallel anchor creation from sequence creationCaio Marcelo de Oliveira Filho2009-10-261-29/+61
| | * | | | QGAL: complex anchors can indicate errors when refreshing sizehintCaio Marcelo de Oliveira Filho2009-10-262-22/+31
| | | |/ / | | |/| |
| * | | | CompileOlivier Goffart2009-10-271-0/+1
| * | | | Respect the per-item layoutSpacing() if the style uses that feature.Jan-Arve Sæther2009-10-275-69/+109
| * | | | If a QGraphicsWidget gets a StyleChange event, invalidate its layout.Jan-Arve Sæther2009-10-271-0/+2
| * | | | Fix buglet in QGraphicsItem::stackBefore().Andreas Aardal Hanssen2009-10-261-1/+1
| * | | | Wrong worldTransform() on the painter in QGraphicsScene::drawForeground.Bjørn Erik Nilsen2009-10-231-0/+8
| * | | | QGraphicsLineItem leave traces when moving around (reg. against 4.5)Bjørn Erik Nilsen2009-10-231-1/+1
| * | | | Fix crash in QGraphicsView BSP discovered in Amarok.Alexis Menard2009-10-221-6/+8
| * | | | Warning --Alexis Menard2009-10-221-1/+1
* | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-294-9/+29
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | qdoc: Update QGraphicsTransform docs after changes to QGraphicsRotationRhys Weatherley2009-10-281-0/+3
| * | | | Doc: Fixed qdoc warning.David Boddie2009-10-271-1/+1
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-274-56/+93
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Doc: Fixed qdoc warnings.David Boddie2009-10-261-2/+21
| | | |/ | | |/|
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-236-10/+326
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-227-80/+104
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | QtGui release/debug binary compatibilityShane Kearns2009-10-222-7/+5
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-261-3/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-261-3/+1