diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-29 14:04:08 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-31 21:09:59 +0000 |
| commit | 307da60fb01d181768520cd70623e876055d08dd (patch) | |
| tree | 412bce507f919df7c5b84962ebbbcb0a0bb4a280 | |
| parent | fe979a809fb1ae4c124f2cb11187b96326544361 (diff) | |
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>
(cherry picked from commit 15b0809f069ef29320d13936a1aed7ed422a8b43)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index aa9f8a8ce4..fb71ff7b38 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -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); diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index fe7396ae4c..b55257533a 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -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); |