summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicsgridlayout
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-33/+0
|\
| * Remove dead code from qgraphicsgridlayout autotestJason McDonald2011-05-041-33/+0
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
|/
* Merge branch 'master-upstream'Gabriel de Dietrich2011-02-081-0/+158
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-0/+158
| |\
| | * Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-171-0/+158
| | |\
| | | * Some unit tests for layout explosion thingyJohn Tapsell2011-01-131-0/+158
* | | | 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-5/+4
* | | Fix some wrong tests in heightForWidth()Jan-Arve Saether2011-01-191-15/+18
* | | Fix and enable the tests that were disabled.Jan-Arve Saether2011-01-191-37/+33
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-22/+330
|\ \ | |/
| * Fix the tests that got affected by the behaviour added in 604c51f1fc5c79Jan-Arve Sæther2010-11-191-2/+2
| * Adhere to code styleJan-Arve Sæther2010-11-151-4/+4
| * Change the QGraphics*Layout documentation to match the code - that the defaul...John Tapsell2010-11-151-2/+43
| * Fix item alignment in layouts bigger than the items thay they containJohn Tapsell2010-11-151-9/+61
| * Add autotest to test a issue with stretches and preferred width.Jan-Arve Sæther2010-11-151-0/+62
| * Add back the tests that were removed by commit fcda1b785bd7d86011f49bfe96cb22...Jan-Arve Sæther2010-11-121-0/+174
| * Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58Jan-Arve Sæther2010-11-111-7/+12
* | Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-251-31/+219
|\ \ | |/
| * QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-131-156/+177
| * QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-131-0/+35
| * Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-131-4/+360
| * Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-301-360/+4
* | Enable the width-for-height codepath and add autotest for WFH.Jan-Arve Sæther2010-09-021-62/+301
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-16/+372
|\ \ | |/
| * Merge branch 'hfw_2nd' into 4.7Jan-Arve Sæther2010-08-111-4/+360
| |\
| | * Fix (implement!) hfw/wfh in QGridLayoutEngineJan-Arve Sæther2010-08-101-4/+360
| * | Layout items had the wrong size if the layout was resized to maximum.Jan-Arve Sæther2010-08-111-12/+12
| |/
* | Some polishing to merge request 723Jan-Arve Sæther2010-08-111-2/+11
* | Patch to QTBUG-3078Carolina Gomes2010-08-111-0/+18
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-0/+7
|\ \ | |/
| * Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-141-0/+7
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-22/+64
|\ \ | |/
| * Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-161-22/+64
* | Added 'parallel_test' for some QGraphics* auto-tests.Yoann Lopes2010-04-221-1/+1
|/
* 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-160/+222
|/
* Replace most processEvents() with sendPostedEvents().Jan-Arve Sæther2009-11-101-8/+8
* Do not loop forever if we are adding the layout itself to the layout.Jan-Arve Sæther2009-10-191-0/+11
* 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
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Removed trailing whitespace.Jan-Arve Sæther2009-06-241-59/+59