Remove QEXPECT_FAIL for tests that pass now on Android
Fixes: QTBUG-69214 Fixes: QTBUG-69218 Fixes: QTBUG-69220 Change-Id: I8b780db8d9dad1a877bc16e802e6ae92de0c8f23 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
parent
f584356eef
commit
15b0809f06
@ -347,9 +347,6 @@ void tst_QFont::resetFont()
|
||||
|
||||
QCOMPARE(firstChild.font().resolveMask(), QFont::SizeResolved);
|
||||
QCOMPARE(secondChild.font().resolveMask(), QFont::SizeResolved);
|
||||
#ifdef Q_OS_ANDROID
|
||||
QEXPECT_FAIL("", "QTBUG-69214", Continue);
|
||||
#endif
|
||||
QCOMPARE(firstChild.font().pointSize(), parent.font().pointSize());
|
||||
QCOMPARE(secondChild.font().pointSize(), parent.font().pointSize());
|
||||
QVERIFY(parent.font().resolveMask() != 0);
|
||||
|
@ -461,9 +461,6 @@ void tst_QStaticText::rotatedPainter()
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
QEXPECT_FAIL("", "QTBUG-69218", Continue);
|
||||
#endif
|
||||
if (!supportsTransformations())
|
||||
QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
@ -621,9 +618,6 @@ void tst_QStaticText::transformationChanged()
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
QEXPECT_FAIL("", "QTBUG-69220", Continue);
|
||||
#endif
|
||||
if (!supportsTransformations())
|
||||
QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
|
Loading…
x
Reference in New Issue
Block a user