diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:50:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 12:50:29 +0200 |
| commit | 9e04c60ac070348f8208fb0254e62d6e593320c3 (patch) | |
| tree | cd038cf2612faf8dadeae5fb8b807b66e2291026 /tests/auto/qfont/tst_qfont.cpp | |
| parent | bfa8d15e15fdeb0bbfb6575e37be1c32445ab7cc (diff) | |
| parent | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (diff) | |
Merge "Merge branch 'master' into refactor" into refactor
Diffstat (limited to 'tests/auto/qfont/tst_qfont.cpp')
| -rw-r--r-- | tests/auto/qfont/tst_qfont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp index 711ffc0b53..a564e71e19 100644 --- a/tests/auto/qfont/tst_qfont.cpp +++ b/tests/auto/qfont/tst_qfont.cpp @@ -604,8 +604,8 @@ void tst_QFont::serializeSpacing() void tst_QFont::lastResortFont() { -#ifdef Q_WS_QWS - QSKIP("QFont::lastResortFont() may abort with qFatal() on QWS", SkipAll); +#if defined(Q_WS_QWS) || defined(Q_WS_QPA) + QSKIP("QFont::lastResortFont() may abort with qFatal() on QWS/QPA", SkipAll); // ...if absolutely no font is found. Just as ducumented for QFont::lastResortFont(). // This happens on our CI machines which run QWS autotests. #endif |