diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-07 13:14:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-08 17:57:05 +0200 |
| commit | c98943b4cd1c2c2007a9be19a0cfbe8739ab8ccb (patch) | |
| tree | 222df1b32b5a662a8c7456814cc3312f985dc5c8 /tests | |
| parent | 1142dde83e888f8d8ea15099c3634a59faf8fe33 (diff) | |
Expect fail font family mismatch in the right place
This fixes 4ca4fb93f666820ab10fc0e17f54b2b777540779
where the fix was right, just in the wrong place.
Change-Id: I3cde24624e3789870f1c16ccb92f78f7fc567fd5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 082bb94b60..acb55c2d86 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -667,15 +667,6 @@ void tst_QFont::defaultFamily_data() void tst_QFont::defaultFamily() { -#if defined(Q_OS_MAC) - if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) { - QEXPECT_FAIL("serif", "See QTBUG-32834", Continue); - QEXPECT_FAIL("monospace", "See QTBUG-32834", Continue); - QEXPECT_FAIL("cursive", "See QTBUG-32834", Continue); - QEXPECT_FAIL("fantasy", "See QTBUG-32834", Continue); - } -#endif - QFETCH(QFont::StyleHint, styleHint); QFETCH(QStringList, acceptableFamilies); @@ -694,6 +685,15 @@ void tst_QFont::defaultFamily() break; } } + +#if defined(Q_OS_MAC) + if (QSysInfo::MacintoshVersion == QSysInfo::MV_10_8) { + QEXPECT_FAIL("serif", "See QTBUG-32834", Continue); + QEXPECT_FAIL("monospace", "See QTBUG-32834", Continue); + QEXPECT_FAIL("cursive", "See QTBUG-32834", Continue); + QEXPECT_FAIL("fantasy", "See QTBUG-32834", Continue); + } +#endif QVERIFY2(isAcceptable, msgNotAcceptableFont(familyForHint, acceptableFamilies)); } |