summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsproxywidget.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animat...Thierry Bastian2009-05-221-5/+4
|\
| * 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-201-5/+1
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-171-2/+6
|\ \ | |/
| * Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-071-2/+6
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1494
* Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-171-0/+1496