summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgridlayoutengine.cpp
Commit message (Expand)AuthorAgeFilesLines
* Fixed a bug where spans across empty cells got broken.Jan Arve Saether2013-04-041-1/+1
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Converting from double to qreal in guimread2011-10-101-4/+4
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* Merge branch 'master-upstream'Gabriel de Dietrich2011-02-081-2/+3
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-2/+3
| |\
| | * 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
* | | | Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
| |\ \ \ | | |/ /
| | * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |/
* | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-1/+1
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-84/+101
|\ \ | |/
| * Fix item alignment in layouts bigger than the items thay they containJohn Tapsell2010-11-151-35/+57
| * Code style cleanup for merge request 847Jan-Arve Sæther2010-11-121-4/+4
| * Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58Jan-Arve Sæther2010-11-111-50/+45
* | Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-251-194/+123
|\ \ | |/
| * QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-131-7/+10
| * QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-131-187/+113
| * Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-131-11/+240
| * Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-301-240/+11
* | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-12/+11
|\ \ | |/
| * Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-09-301-12/+11
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-18/+248
|\ \ | |/
| * Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-111-11/+240
| |\
| | * Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-101-11/+240
| * | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-111-7/+8
| |/
* | Some polishing to merge request 723Jan-Arve Sæther2010-08-111-2/+2
* | Patch to QTBUG-3078Carolina Gomes2010-08-111-0/+9
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071-1/+1
|\
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | Fixed a bug with distribution of spans.Jan-Arve Sæther2010-01-051-2/+2
|/
* qreal-izationAleksandar Sasha Babic2009-12-151-1/+2
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Make sure itemAt() reflects the visual order.Jan-Arve Sæther2009-08-271-4/+18
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+1542
* Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-3/+3
* 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
* Long live Qt!Lars Knoll2009-03-231-0/+1542