summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1751-53/+54
|\
| * Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
| * Update copyright year to 2011.Jason McDonald2011-01-1151-51/+51
| * Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-071-1/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-202-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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-136-13/+22
|\|
| * 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
| |/
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-297-100/+146
|\ \
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-257-100/+146
| |\|
| | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-201-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
* | | | Fix transformIsSimple in QGraphicsSceneJørgen Lind2010-11-221-18/+1
|/ / /
* | | Change in QGraphicsView documentation.Yoann Lopes2010-11-151-4/+3
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-3/+3
|\| |
| * | Doc: Fixing typoSergio Ahumada2010-11-093-3/+3
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-2/+2
|\|
| * Fixed many spelling errors.Rohan McGovern2010-10-251-2/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-8/+33
|\|
| * Further focus scope fixes.Michael Brasser2010-10-201-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-142-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
| |\ \ \ | | |_|/ | |/| |
* | | | Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-253-201/+133
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |/ | |/|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-213-8/+11
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-193-8/+11
| |\ \ \
| | * | | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-193-8/+11
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-191-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2010-10-181-2/+2
| |/ / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-7/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-112-7/+11
| |/