diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /tests/auto/gui/text/qfont/tst_qfont.cpp | |
parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/text/qfont/tst_qfont.cpp')
-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)); } |