summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Fix a regression where setPreferredSize(QSize(100, -1)) did not work.Jan-Arve Sæther2010-09-101-1/+1
* 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
|\ \ \ | |/ /
| * | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-242-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 branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-177-23/+332
|\ \ | |/
| * Properly emit geometryChanged() when the position change.Alexis Menard2010-08-121-1/+2
| * Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-116-15/+322
| |\
| | * Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-104-13/+318
| | * Fixed a bug in implementation of sizeHint() when there was a constraintJan-Arve Sæther2010-08-102-2/+4
| * | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-111-7/+8
* | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
|/ /
* | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-092-0/+33
|\ \
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-062-0/+33
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-061-0/+5
|\ \ \ | |/ /
| * | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-051-0/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-051-0/+5
|\ \ \ | |/ /
| * | Don't crash if an item is removed from the scene while it is gaining focus.Martin Jones2010-08-041-0/+5
* | | Doc: Fixed qdoc warnings.David Boddie2010-08-052-0/+39
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-302-3/+9
|\ \
| * | Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-07-292-3/+9
* | | Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-...Jerome Pasion2010-07-291-3/+3
|/ /
* | Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-271-3/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-231-0/+1
|\ \
| * | doc: Added missing \since 4.7 to effect propertyu.Martin Smith2010-07-231-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-212-0/+13
|\ \ \ | |/ / |/| |
| * | QML focus API updates.Michael Brasser2010-07-212-0/+13
* | | QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-201-1/+6
|/ /
* | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+2
|\ \
| * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-162-8/+6
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-141-1/+2
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-101-1/+2
| | |\ \
| | | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
* | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-162-7/+34
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-152-7/+34
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed missing clip when computing the graphics item effect source rect.Samuel Rødal2010-07-022-7/+34
* | | | | Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-142-8/+6
|/ / / /
* | | | Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-131-2/+4
* | | | Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-131-2/+2
| |/ / |/| |