diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-03-16 01:40:42 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2011-03-16 01:40:42 (GMT) |
| commit | 82ae515e52e3811d3b2aec588e0dd777350c1c33 (patch) | |
| tree | 0f67931ff94feafa8b76cfd22064220ee4986fe0 /tests/auto/qfont/tst_qfont.cpp | |
| parent | 9a5f3dd71a7c3bb4e777c92cca09100d077a736a (diff) | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| download | Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.zip Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.tar.gz Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'tests/auto/qfont/tst_qfont.cpp')
| -rw-r--r-- | tests/auto/qfont/tst_qfont.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp index 82c8f65..dabe3fa 100644 --- a/tests/auto/qfont/tst_qfont.cpp +++ b/tests/auto/qfont/tst_qfont.cpp @@ -150,6 +150,13 @@ void tst_QFont::exactMatch() return; #endif +#ifdef Q_WS_X11 + QVERIFY(QFont("sans").exactMatch()); + QVERIFY(QFont("sans-serif").exactMatch()); + QVERIFY(QFont("serif").exactMatch()); + QVERIFY(QFont("monospace").exactMatch()); +#endif + QSKIP("This test is bogus on Unix with support for font aliases in fontconfig", SkipAll); return; |