summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-262-5/+5
|\
| * Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-171-2/+3
| |\
| | * Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-131-2/+3
| * | Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
* | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1351-52/+54
|\ \ \ | |/ /
| * | Update copyright year to 2011.Jason McDonald2011-01-1051-51/+51
| * | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-071-1/+3
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-162-2/+3
|\ \ | |/
| * Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| * Make sure that d->init() is called from both ctors.Jan-Arve Sæther2010-12-141-1/+2
| * Fixes text jitter in QtQuick components when using the virtual keyboardGabriel de Dietrich2010-12-131-1/+1
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-14/+23
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-091-2/+2
| |\
| | * Fixed DeviceCoordinateCache items when using QGraphicsScene::render().Samuel Rødal2010-12-091-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-093-3/+8
| |\ \ | | |/ | |/|
| | * QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cacheJohn Tapsell2010-12-032-2/+7
| | * Fix integer overflow in bitfieldJan-Arve Sæther2010-12-031-1/+1
| * | Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-072-9/+13
| |/
* | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-1/+3
* | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-131-3/+1
|/
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-191-1/+1
|\
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
* | Improve performance of hfw in qgridlayoutengine by adding more caching.Jan-Arve Sæther2010-11-192-11/+26
* | Some improvements to the docs that was added in merge request 894Jan-Arve Sæther2010-11-151-1/+1
* | Change the QGraphics*Layout documentation to match the code - that the defaul...John Tapsell2010-11-152-2/+13
* | Fix item alignment in layouts bigger than the items thay they containJohn Tapsell2010-11-152-37/+62
* | Code style cleanup for merge request 847Jan-Arve Sæther2010-11-121-4/+4
* | Merge branch 'fixes-to-merge-requests' into 4.7Jan-Arve Sæther2010-11-121-50/+45
|\ \ | |/ |/|
| * Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58Jan-Arve Sæther2010-11-111-50/+45
* | Doc: Fixing typoSergio Ahumada2010-11-093-3/+3
|/
* Fixed many spelling errors.Rohan McGovern2010-10-251-2/+2
* Further focus scope fixes.Michael Brasser2010-10-191-7/+12
* Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
* Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-141-0/+16
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-132-7/+11
| |\
| * | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-134-37/+274
|\ \ \ | |_|/ |/| |
| * | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-132-10/+11
| * | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-132-191/+122
| * | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-134-13/+318
| |/
* | Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-112-7/+11
|/
* Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
* QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-061-18/+58
* Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-041-1/+1
* FocusOut even when QGraphicsItem gets hidden.Frederik Gladhorn2010-10-011-3/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-015-332/+30
|\
| * Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-304-318/+13
| * Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-09-301-12/+11
| * Fix double painting when adding an item into a linear layoutThierry Bastian2010-09-291-2/+6
* | Add sendParentChangeNotification to QGraphicsItemMarco Bubke2010-09-302-4/+16
|/