diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:36:01 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:36:01 (GMT) |
| commit | cd14bd2c7645e29af325095c1adf29d61f0e6f61 (patch) | |
| tree | c442d2d2fee6d86cda6c0d75a28dfb44f4422c90 /tests | |
| parent | 527f67325c200940e403f32b0db8f8c2677a1159 (diff) | |
| parent | ab13e9c099a505a821caaccc6ae252388e676083 (diff) | |
| download | Qt-cd14bd2c7645e29af325095c1adf29d61f0e6f61.zip Qt-cd14bd2c7645e29af325095c1adf29d61f0e6f61.tar.gz Qt-cd14bd2c7645e29af325095c1adf29d61f0e6f61.tar.bz2 | |
Merge branch '4.7' into QTBUG-15333
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 2e52c4e..35ea059 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -2541,7 +2541,7 @@ void tst_QGraphicsGridLayout::geometries_data() .sizeHint(Qt::MaximumSize, QSizeF(5000,5000)) .heightForWidth(hfw1) ) - << QSizeF(160, 401) + << QSizeF(160, 350) << (RectList() << QRectF( 0, 0, 80, 100) << QRectF( 80, 0, 80, 100) << QRectF( 0, 100, 80, 100) << QRectF( 80, 100, 80, 250) @@ -2566,7 +2566,7 @@ void tst_QGraphicsGridLayout::geometries_data() .sizeHint(Qt::MaximumSize, QSizeF(5000,5000)) .heightForWidth(hfw1) ) - << QSizeF(500, 401) + << QSizeF(500, 200) << (RectList() << QRectF( 0, 0, 100, 100) << QRectF(100, 0, 100, 100) << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400, 50) |