mirror of https://github.com/qt/qtbase.git
Fix test compilation with QT_NO_WIDGETS
Amends 68a5ec23f6
where the
test function was added outside the right #ifdef-block.
Pick-to: 6.5 6.8 6.9 6.10
Task-number: QTBUG-138678
Change-Id: If96132d724b3373d728c8b440f3d5c2473d44610
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
parent
dbcc76b132
commit
5aecefc6a1
|
@ -83,9 +83,9 @@ private slots:
|
||||||
|
|
||||||
void columnWidthWithImage_data();
|
void columnWidthWithImage_data();
|
||||||
void columnWidthWithImage();
|
void columnWidthWithImage();
|
||||||
#endif
|
|
||||||
|
|
||||||
void QTBUG138678_insertColumnAtStartWithRowspan();
|
void QTBUG138678_insertColumnAtStartWithRowspan();
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QTextTable *create2x2Table();
|
QTextTable *create2x2Table();
|
||||||
|
@ -1413,7 +1413,6 @@ void tst_QTextTable::columnWidthWithImage()
|
||||||
QVERIFY(rightRect.left() > leftRect.right());
|
QVERIFY(rightRect.left() > leftRect.right());
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
void tst_QTextTable::QTBUG138678_insertColumnAtStartWithRowspan()
|
void tst_QTextTable::QTBUG138678_insertColumnAtStartWithRowspan()
|
||||||
{
|
{
|
||||||
|
@ -1457,6 +1456,7 @@ void tst_QTextTable::QTBUG138678_insertColumnAtStartWithRowspan()
|
||||||
// Don't assert
|
// Don't assert
|
||||||
currentTable->insertColumns(0, 1);
|
currentTable->insertColumns(0, 1);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
QTEST_MAIN(tst_QTextTable)
|
QTEST_MAIN(tst_QTextTable)
|
||||||
|
|
Loading…
Reference in New Issue