summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-035-78/+189
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-035-78/+189
| |\
| | * Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-04-281-4/+1
| | * Merge branch '4.7-upstream' into 4.7Thierry Bastian2011-04-206-20/+29
| | |\
| | * | Avoid flicker when invalidate is propagated in a widget/layout hierarchyJan-Arve Sæther2011-04-145-76/+190
| | * | Do not call setSizePolicy from ctor, it might call a virtual functionJan-Arve Sæther2011-04-141-2/+2
* | | | Merge earth-team into origin/4.8Olivier Goffart2011-05-031-2/+2
|\ \ \ \ | |/ / /
| * | | Typos in internal api docs.Frederik Gladhorn2011-04-221-2/+2
* | | | Fixes warnings about unused variablesOlivier Goffart2011-04-282-6/+2
|/ / /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-4/+1
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-1/+1
| |\ \
| | * | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-225-12/+38
| | |\ \
| * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-011-3/+0
| |\ \ \ \
| | * | | | QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfe...Michael Hasselmann2011-04-011-3/+0
* | | | | | Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1J-P Nurmi2011-04-051-0/+13
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-012-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-012-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Rotation transform with NaN angle can cause crashMartin Jones2011-03-301-1/+3
| | * | | | Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-301-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-10/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-225-12/+38
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-12/+11
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-231-9/+11
| |\ \ \ \
| | * | | | Doc: Work on QGraphicsItem::ItemSceneChange/ItemSceneHasChangedGeir Vattekar2011-02-231-9/+11
| * | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-1/+1
| | * | | | Merge branch '4.7' into mimirDavid Boddie2010-12-156-14/+23
| | |\ \ \ \
* | | \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-174-8/+26
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-03-164-8/+26
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Introduce QGraphicsItem::ItemStopsFocusHandling flagMichael Hasselmann2011-03-164-8/+26
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-141-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-153-22/+23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-081-2/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-2051-53/+54
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-113-4/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-103-4/+12
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix QGraphicsScene returning incorrect focus item.Yoann Lopes2011-03-103-4/+12
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-102-17/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-101-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stop focus propagation of touch events when flag is set.Niklas Kurkisuo2011-02-091-0/+4
| | |/ / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-12/+7
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Don't clear pre-edit text when a graphics items loses focus.Andrew den Exter2011-02-091-12/+7
| * | | | | | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-071-3/+3
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-5/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-262-5/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1351-52/+54
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-162-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-14/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |