diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-06-29 13:42:27 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2018-06-30 19:32:53 +0000 |
commit | 6bd40bedd1b4f853d7eac301368ef8e2b92a8e8c (patch) | |
tree | dfac4912ba0ba1698e9360dd44e86426601f6ba1 /tests/auto/gui | |
parent | 8ac79692b35d7b245e4bc369d8f38d64788eb900 (diff) |
Android: tst_QFont: QEXPECT_FAIL a couple failing checks
Task-number: QTBUG-69214
Task-number: QTBUG-69215
Change-Id: I566fe086adec059251aa367c4ef41f42e119f764
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 7d230d3bb3..8090f38a2c 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -300,6 +300,9 @@ void tst_QFont::resetFont() child->setFont(QFont()); // reset font QCOMPARE(child->font().resolve(), uint(0)); +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("", "QTBUG-69214", Continue); +#endif QCOMPARE(child->font().pointSize(), parent.font().pointSize()); QVERIFY(parent.font().resolve() != 0); } @@ -539,6 +542,9 @@ void tst_QFont::defaultFamily() } } +#ifdef Q_OS_ANDROID + QEXPECT_FAIL("serif", "QTBUG-69215", Continue); +#endif QVERIFY2(isAcceptable, msgNotAcceptableFont(familyForHint, acceptableFamilies)); } |