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>
This commit is contained in:
Mårten Nordheim 2018-06-29 13:42:27 +02:00
parent 8ac79692b3
commit 6bd40bedd1

View File

@ -300,6 +300,9 @@ void tst_QFont::resetFont()
child->setFont(QFont()); // reset font child->setFont(QFont()); // reset font
QCOMPARE(child->font().resolve(), uint(0)); QCOMPARE(child->font().resolve(), uint(0));
#ifdef Q_OS_ANDROID
QEXPECT_FAIL("", "QTBUG-69214", Continue);
#endif
QCOMPARE(child->font().pointSize(), parent.font().pointSize()); QCOMPARE(child->font().pointSize(), parent.font().pointSize());
QVERIFY(parent.font().resolve() != 0); 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)); QVERIFY2(isAcceptable, msgNotAcceptableFont(familyForHint, acceptableFamilies));
} }