diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-14 13:03:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 02:36:47 +0100 |
| commit | 1acc490248655d7a2db5835f6f9ac0c68d6df454 (patch) | |
| tree | 64c3e560163a1c5936e821766971e5293fbb4357 /tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | |
| parent | 22e0060e596c73e614f88f1269893214cf24bf6a (diff) | |
Eliminate duplicate data row names in widgets autotests.
Change-Id: I82bab3cc39320014fac6732c7b60233b262cb30d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index c8e5591f8b..c43ea065f3 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -797,6 +797,16 @@ void tst_QGridLayout::minMaxSize_data() << SizeInfo(QPoint(10, 10), QSize( 90, 90), QSize(100,100)) << SizeInfo(QPoint(10 + 100 + 1, 10), QSize( 90, 90)) ); + QTest::newRow("2x1 grid, extend to minimumSize, motif") << QString::fromAscii("motif") << 2 << 1 + << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() + << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) + << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) + ); + QTest::newRow("2x1 grid, extend to minimumSize, windows") << QString::fromAscii("windows") << 2 << 1 + << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() + << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) + << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) + ); QTest::newRow("1x2 grid, extend to minimumSize") << QString() << 1 << 2 << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() << SizeInfo(QPoint(10, 10), QSize( 90, 90), QSize(100,100)) @@ -818,17 +828,6 @@ void tst_QGridLayout::minMaxSize_data() << SizeInfo(QPoint(10, 10 + 100 + 1), QSize(100,100), QSize(), QSize(), 100*100) << SizeInfo(QPoint(10, 10 + 100 + 1 + 50 + 1), QSize(100,100), QSize(), QSize(100, 100)) ); - QTest::newRow("2x1 grid, extend to minimumSize") << QString::fromAscii("motif") << 2 << 1 - << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() - << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) - << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) - ); - QTest::newRow("2x1 grid, extend to minimumSize") << QString::fromAscii("windows") << 2 << 1 - << int(QSizePolicy::Preferred) << QSize() << (SizeInfoList() - << SizeInfo(QPoint(11, 11), QSize( 90, 90), QSize(100,100)) - << SizeInfo(QPoint(11 + 100 + 6, 11), QSize( 90, 90)) - ); - } void tst_QGridLayout::minMaxSize() |