summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-12 13:53:21 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-12 13:53:22 +0100
commitd3b3be6865b78479da6c7e822b80064a6ea08554 (patch)
tree4843426950d1bc933ee8685c94f8905f20f3d678 /tests/auto/gui
parent7472415f3f331ccd415cc644cc210d2457ef690c (diff)
parentfd88c152db0949e47613858a914a6ae4a825781d (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/text/qtexttable/tst_qtexttable.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 29eef506bf..22f00c677d 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -431,6 +431,12 @@ void tst_QTextTable::insertRows()
table->insertRows(5, 2);
QCOMPARE(table->rows(), 7);
+ table = cursor.insertTable(5,5);
+ table->mergeCells(0,0,3,3);
+ table->insertRows(2,1);
+
+ QCOMPARE(table->rows(), 6);
+
}
void tst_QTextTable::deleteInTable()