From e24021691ffffbd9cda91340fc2e8d5dcfd88d24 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 27 Jan 2012 14:41:24 +0200 Subject: Revert "Revert "Blow up earlier when adding test rows without columns."" The problem in qmltest has now been fixed by adding a dummy column, so this should be good to re-add. See qtdeclarative change id I1bfed663fa7b58d71e0cf898db6bd8ae61dae46b. This reverts commit 963958b4f62513cbc76fb06920de80f7f906f523. Task-number: QTBUG-23845 Change-Id: I4b6755d3ea97a4624480cc008d280fc8e33743a6 Reviewed-by: Jonas Gastal Reviewed-by: Yunqiao Yin --- src/testlib/qtestcase.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/testlib') diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index e2b01ae040..8a1d4bf44a 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2286,6 +2286,7 @@ QTestData &QTest::newRow(const char *dataTag) QTEST_ASSERT_X(dataTag, "QTest::newRow()", "Data tag can not be null"); QTestTable *tbl = QTestTable::currentTestTable(); QTEST_ASSERT_X(tbl, "QTest::newRow()", "Cannot add testdata outside of a _data slot."); + QTEST_ASSERT_X(tbl->elementCount(), "QTest::newRow()", "Must add columns before attempting to add rows."); return *tbl->newData(dataTag); } -- cgit v1.2.3