Revert "Blow up earlier when adding test rows without columns."
This seems to break a number of tests using the qmltest library.
Functionality will be restored in a future commit, once the breakage has been
identified.
This reverts commit fdedb49b76
.
Task-number: QTBUG-23845
Change-Id: I0ca4dbd54132e4250702f06738edbad5e8fc4f36
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
This commit is contained in:
parent
d0cb57a4e7
commit
141e5c3878
@ -2286,7 +2286,6 @@ QTestData &QTest::newRow(const char *dataTag)
|
|||||||
QTEST_ASSERT_X(dataTag, "QTest::newRow()", "Data tag can not be null");
|
QTEST_ASSERT_X(dataTag, "QTest::newRow()", "Data tag can not be null");
|
||||||
QTestTable *tbl = QTestTable::currentTestTable();
|
QTestTable *tbl = QTestTable::currentTestTable();
|
||||||
QTEST_ASSERT_X(tbl, "QTest::newRow()", "Cannot add testdata outside of a _data slot.");
|
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);
|
return *tbl->newData(dataTag);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user