summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-05-181-1/+1
|\
| * Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-121-1/+1
| |\
| | * Fix compilation after a merge errorAlexis Menard2009-04-171-3/+4
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1712-481/+936
| | |\
| | * | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-1736-0/+34531
| | /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1212-497/+973
| |\ \
| * | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-1736-0/+34531
| / /
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Warwick Allison2009-05-153-30/+12
|\ \ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-05-143-28/+10
| |\ \ \
| | * | | Fix QGraphicsItem::deviceTransform() to also work with normal items.Andreas Aardal Hanssen2009-05-143-28/+10
| * | | | Fix sending of double-click events after explicit grab-ungrab.Andreas Aardal Hanssen2009-05-141-1/+2
| * | | | Merge branch '4.5'Thiago Macieira2009-05-131-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Reset the 'connectedToScene' flag when changing the scene of a viewLeonardo Sobral Cunha2009-05-131-0/+1
| | |/ /
* | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-132-6/+46
* | | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-1/+34
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Alexis Menard2009-05-123-11/+11
|\ \ \ \ | |/ / /
| * | | Fixed dumping so that we dump both q_yy and q_xx instead of q_yy twice.Jan-Arve Sæther2009-05-121-1/+1
| * | | Don't overwrite q_yy with q_xx when we are dumping the layout.Jan-Arve Sæther2009-05-121-9/+9
| * | | Fixed 71 symbols exported that didn't need to be.Thierry Bastian2009-05-112-2/+2
* | | | Fix double-click AND flicking.Warwick Allison2009-05-111-1/+3
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-076-261/+300
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Thiago Macieira2009-05-071-2/+2
| |\ \ \ | | |/ /
| | * | Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-2/+2
| * | | Reduced memory footprint of QGraphicsWidget.jasplin2009-05-075-259/+298
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-063-22/+35
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-22/+35
| |\ \ \ | | |/ /
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-063-14/+15
| | |\ \
| | | * | QGraphicsItem::setOpacity(0.0) does not trigger an update.Bjoern Erik Nilsen2009-05-063-14/+15
| | * | | Doc: Updated docs for collision between QGraphicsItemsGeir Vattekar2009-05-061-8/+20
| | |/ /
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-051-4/+0
|\ \ \ \ | |/ / /
| * | | Partially revert 37c72476fc444d3089075473cb4e9aa42ed64694Bjoern Erik Nilsen2009-05-051-4/+0
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-283-10/+36
|\ \ \ \ | |/ / /
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-3/+1
| * | | Fix bugs in QGraphicsItem::childrenBoundingRect()Andreas Aardal Hanssen2009-04-232-7/+35
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-225-13/+22
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Rhys Weatherley2009-04-212-2/+16
| |\ \ \ | | |/ /
| | * | BT: Revert "Fixes: Don't fill the pixmap because we will copy the cache in...Andreas Aardal Hanssen2009-04-211-1/+3
| | * | BT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck)Andreas Aardal Hanssen2009-04-211-1/+13
| | * | We don't need to call two times itemChange when an item is deleted.Alexis Menard2009-04-211-6/+0
| | |/
| | * Update the item if the text has changed but the boundingRect is theAlexis Menard2009-04-151-0/+1
| * | Doc update for QGraphicsProxyWidget::setWidget().Andreas Aardal Hanssen2009-04-201-3/+2
| * | Fixup docs for QGraphicsProxyWidget::setWidget().Andreas Aardal Hanssen2009-04-201-0/+4
| * | Working on QGraphicsProxyWidget's handling of widget flags.Andreas Aardal Hanssen2009-04-203-11/+3
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-229-11/+291
|/ /
* | Fix QGraphicsView::mapToScene(QRect) to avoid extra adjustments.Andreas Aardal Hanssen2009-04-171-7/+8
* | Fix two bugs in Graphics View's mouse grab logics + add autotests.Andreas Aardal Hanssen2009-04-172-7/+15
* | Update the item if the text has changed but the boundingRect is theAlexis Menard2009-04-151-0/+1
* | Clean up and fix bug in merge conflict for 21099dac.Andreas Aardal Hanssen2009-04-151-10/+12
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-153-33/+51
|\ \ | |/
| * BT: Fix a regression to 4.4 in Graphics View's handling of child clippersAndreas Aardal Hanssen2009-04-151-14/+16