summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-155-9/+28
|\
| * Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-131-2/+4
| * Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-131-2/+2
| * Fix subfocus when reparenting panels.Andreas Aardal Hanssen2010-07-081-0/+3
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-014-4/+15
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-014-4/+15
| | |\
| | | * Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.Bjørn Erik Nilsen2010-06-244-4/+15
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-011-4/+7
| |\ \ \ | | |/ / | |/| |
| | * | Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-291-4/+7
| | |/
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-015-9/+48
|\ \ \ | |/ /
| * | QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| * | QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-301-2/+1
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-185-5/+19
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+2
| | |\
| | | * Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-171-1/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-171-1/+8
| | | |\ \ | | | | |/
| | | * | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+15
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-163-3/+15
| | | |/
| * | | Doc: Fixed documentation errors.David Boddie2010-06-181-1/+1
| |/ /
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-077-14/+44
| |\ \ | | |/
| * | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-071-1/+8
* | | Merge remote branch 'origin/master'Olivier Goffart2010-06-157-2/+36
|\ \ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-087-2/+36
| |\ \ \ | | | |/ | | |/|
| | * | Add a new qconfig feature GESTURESTasuku Suzuki2010-06-027-0/+32
| | * | Don't remove the pixmap from cache when not modifying it.Andreas Aardal Hanssen2010-06-011-2/+4
* | | | Finally, remove some trailing whitespace.Andreas Aardal Hanssen2010-06-1410-33/+33
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-013-18/+32
|\ \ \ | |/ /
| * | Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.Andreas Aardal Hanssen2010-06-011-13/+6
| * | Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().Andreas Aardal Hanssen2010-06-011-1/+4
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-271-3/+3
| |\
| | * Wrong QGraphicsItem::childrenBoundingRect() when applying effects.Bjørn Erik Nilsen2010-05-271-3/+3
| * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-271-0/+18
| |\ \ | | |/
| | * Redraw issues when removing a fully transparent QGraphicsItem from the scene.Bjørn Erik Nilsen2010-05-261-0/+18
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-251-1/+1
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-241-1/+1
| | |\
| | | * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-242-150/+78
| | | |\
| | | * | doc: Fixed many broken links.Martin Smith2010-05-201-1/+1
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-253-156/+89
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-251-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed compile with xlC.Rohan McGovern2010-05-251-1/+2
| * | | | Don't polish QDeclarativeItems.Warwick Allison2010-05-241-5/+9
| | |_|/ | |/| |
| * | | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-140/+68
| * | | Fixes wrong QGraphicsItemCache::boundingRect.Bjørn Erik Nilsen2010-05-211-10/+10
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-207-27/+63
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-194-7/+16
| |\ \ | | |/
| * | doc: Fixed many broken links.Martin Smith2010-05-193-3/+3
| * | doc: Fixed many broken links.Martin Smith2010-05-191-16/+16
| * | Gestures in GraphicsView do not require a viewport to subscribe to gestures.Denis Dzyubenko2010-05-185-8/+44